diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-17 01:00:50 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-17 01:00:50 -0400 |
| commit | 539bf8f2c071b53834829259bb3fabf0390c5dc6 (patch) | |
| tree | 16672732afbf4c3f933e67ac677aa1877f6a7657 /tests/guix-pack.sh | |
| parent | 903874328ed5e5ab766e36cee1b1a0989e8b24a9 (diff) | |
| parent | 2cf8531f360ef390d3ec670cc150b106bab5eff1 (diff) | |
| download | guix-patches-539bf8f2c071b53834829259bb3fabf0390c5dc6.tar guix-patches-539bf8f2c071b53834829259bb3fabf0390c5dc6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests/guix-pack.sh')
| -rw-r--r-- | tests/guix-pack.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh index 5584c10e00..130389a7ad 100644 --- a/tests/guix-pack.sh +++ b/tests/guix-pack.sh @@ -20,9 +20,9 @@ # Test the `guix pack' command-line utility. # -# A network connection is required to build %bootstrap-coreutils&co, -# which is required to run these tests with the --bootstrap option. -if ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null; then +# The bootstrap binaries are needed to run these tests, which usually requires +# a network connection. +if ! guix build -q guile-bootstrap; then exit 77 fi @@ -87,6 +87,10 @@ guix pack --dry-run --bootstrap -f docker -S /opt/gnu=/ guile-bootstrap # guile-bootstrap is not intended to be cross-compiled. guix pack --dry-run --bootstrap --target=arm-unknown-linux-gnueabihf coreutils +# Likewise, 'guix pack -R' requires a full-blown toolchain (because +# 'glibc-bootstrap' lacks 'libc.a'), hence '--dry-run'. +guix pack -R --dry-run --bootstrap -S /mybin=bin guile-bootstrap + # Make sure package transformation options are honored. mkdir -p "$test_directory" drv1="`guix pack -n guile 2>&1 | grep pack.*\.drv`" |