diff options
| author | Josselin Poiret <dev@jpoiret.xyz> | 2022-05-24 17:55:22 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2022-05-25 09:28:43 +0200 |
| commit | d276a7dd6162d101b7790cc8ea902abfec1eafcb (patch) | |
| tree | 1e60837e06fb0cade87c1f84d5c47a579bb54c31 /tests | |
| parent | 9e2b0dc9e51505e409d5db58e658d7cdab314564 (diff) | |
| download | guix-d276a7dd6162d101b7790cc8ea902abfec1eafcb.tar.gz | |
tests: Fix wrong target triplets.
* tests/gexp.scm (ungexp + ungexp-native, input list + ungexp-native, input list splicing + ungexp-native-splicing, gexp list splicinng + ungexp-splicing, gexp->derivation, cross-compilation, gexp->derivation, ungexp-native, gexp->derivation, ungexp + ungexp-native, gexp->derivation, ungexp-native + composed gexps): Change mips64el-linux to mips64el-linux-gnu. * tests/guix-pack.sh: Change arm-unknown-linux-gnueabihf to arm-linux-gnueabihf. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gexp.scm | 12 | ||||
| -rw-r--r-- | tests/guix-pack.sh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm index 35bd99e6d4..07e940ffdc 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -502,7 +502,7 @@ (ungexp coreutils) (ungexp-native glibc) (ungexp binutils)))) - (target "mips64el-linux") + (target "mips64el-linux-gnu") (guile (derivation->output-path (package-derivation %store %bootstrap-guile))) (cu (derivation->output-path @@ -547,7 +547,7 @@ (gexp->sexp* exp))))) (test-assert "input list + ungexp-native" - (let* ((target "mips64el-linux") + (let* ((target "mips64el-linux-gnu") (exp (gexp (display (cons '(ungexp-native (list %bootstrap-guile coreutils)) '(ungexp (list glibc binutils)))))) @@ -764,7 +764,7 @@ intd))))) (test-assertm "gexp->derivation, cross-compilation" - (mlet* %store-monad ((target -> "mips64el-linux") + (mlet* %store-monad ((target -> "mips64el-linux-gnu") (exp -> (gexp (list (ungexp coreutils) (ungexp output)))) (xdrv (gexp->derivation "foo" exp @@ -778,7 +778,7 @@ (not (member (derivation-file-name cu) refs)))))) (test-assertm "gexp->derivation, ungexp-native" - (mlet* %store-monad ((target -> "mips64el-linux") + (mlet* %store-monad ((target -> "mips64el-linux-gnu") (exp -> (gexp (list (ungexp-native coreutils) (ungexp output)))) (xdrv (gexp->derivation "foo" exp @@ -788,7 +788,7 @@ (derivation-file-name xdrv))))) (test-assertm "gexp->derivation, ungexp + ungexp-native" - (mlet* %store-monad ((target -> "mips64el-linux") + (mlet* %store-monad ((target -> "mips64el-linux-gnu") (exp -> (gexp (list (ungexp-native coreutils) (ungexp glibc) (ungexp output)))) @@ -802,7 +802,7 @@ (member (derivation-file-name xglibc) refs))))) (test-assertm "gexp->derivation, ungexp-native + composed gexps" - (mlet* %store-monad ((target -> "mips64el-linux") + (mlet* %store-monad ((target -> "mips64el-linux-gnu") (exp0 -> (gexp (list 1 2 (ungexp coreutils)))) (exp -> (gexp (list 0 (ungexp-native exp0)))) diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh index 1356a74083..f19a0f754e 100644 --- a/tests/guix-pack.sh +++ b/tests/guix-pack.sh @@ -107,7 +107,7 @@ guix pack --dry-run --bootstrap -f docker -S /opt/gnu=/ guile-bootstrap # Build a tarball pack of cross-compiled software. Use coreutils because # guile-bootstrap is not intended to be cross-compiled. -guix pack --dry-run --bootstrap --target=arm-unknown-linux-gnueabihf coreutils +guix pack --dry-run --bootstrap --target=arm-linux-gnueabihf coreutils # Likewise, 'guix pack -R' requires a full-blown toolchain (because # 'glibc-bootstrap' lacks 'libc.a'), hence '--dry-run'. |