me
/
guix
Archived
1
0
Fork 0
Code

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>
Josselin Poiret 2022-05-24 17:55:22 +02:00 committed by Mathieu Othacehe
parent 9e2b0dc9e5
commit d276a7dd61
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/gexp.scm
View File

@ -502,7 +502,7 @@
(ungexp coreutils) (ungexp coreutils)
(ungexp-native glibc) (ungexp-native glibc)
(ungexp binutils)))) (ungexp binutils))))
(target "mips64el-linux") (target "mips64el-linux-gnu")
(guile (derivation->output-path (guile (derivation->output-path
(package-derivation %store %bootstrap-guile))) (package-derivation %store %bootstrap-guile)))
(cu (derivation->output-path (cu (derivation->output-path
@ -547,7 +547,7 @@
(gexp->sexp* exp))))) (gexp->sexp* exp)))))
(test-assert "input list + ungexp-native" (test-assert "input list + ungexp-native"
(let* ((target "mips64el-linux") (let* ((target "mips64el-linux-gnu")
(exp (gexp (display (exp (gexp (display
(cons '(ungexp-native (list %bootstrap-guile coreutils)) (cons '(ungexp-native (list %bootstrap-guile coreutils))
'(ungexp (list glibc binutils)))))) '(ungexp (list glibc binutils))))))
@ -764,7 +764,7 @@
intd))))) intd)))))
(test-assertm "gexp->derivation, cross-compilation" (test-assertm "gexp->derivation, cross-compilation"
(mlet* %store-monad ((target -> "mips64el-linux") (mlet* %store-monad ((target -> "mips64el-linux-gnu")
(exp -> (gexp (list (ungexp coreutils) (exp -> (gexp (list (ungexp coreutils)
(ungexp output)))) (ungexp output))))
(xdrv (gexp->derivation "foo" exp (xdrv (gexp->derivation "foo" exp
@ -778,7 +778,7 @@
(not (member (derivation-file-name cu) refs)))))) (not (member (derivation-file-name cu) refs))))))
(test-assertm "gexp->derivation, ungexp-native" (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) (exp -> (gexp (list (ungexp-native coreutils)
(ungexp output)))) (ungexp output))))
(xdrv (gexp->derivation "foo" exp (xdrv (gexp->derivation "foo" exp
@ -788,7 +788,7 @@
(derivation-file-name xdrv))))) (derivation-file-name xdrv)))))
(test-assertm "gexp->derivation, ungexp + ungexp-native" (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) (exp -> (gexp (list (ungexp-native coreutils)
(ungexp glibc) (ungexp glibc)
(ungexp output)))) (ungexp output))))
@ -802,7 +802,7 @@
(member (derivation-file-name xglibc) refs))))) (member (derivation-file-name xglibc) refs)))))
(test-assertm "gexp->derivation, ungexp-native + composed gexps" (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 (exp0 -> (gexp (list 1 2
(ungexp coreutils)))) (ungexp coreutils))))
(exp -> (gexp (list 0 (ungexp-native exp0)))) (exp -> (gexp (list 0 (ungexp-native exp0))))

2
tests/guix-pack.sh
View File

@ -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 # Build a tarball pack of cross-compiled software. Use coreutils because
# guile-bootstrap is not intended to be cross-compiled. # 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 # Likewise, 'guix pack -R' requires a full-blown toolchain (because
# 'glibc-bootstrap' lacks 'libc.a'), hence '--dry-run'. # 'glibc-bootstrap' lacks 'libc.a'), hence '--dry-run'.