summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-08-27 00:26:47 +0200
committerLudovic Courtès <ludo@gnu.org>2014-08-27 00:27:12 +0200
commitaf9142dce07c8b5055b2306f330c32ed7f562458 (patch)
tree80099fcffe4f9b028d99a1e2d32b11c871280204
parentd17ef3562088fae280f8a1506d6da71e5f7de135 (diff)
downloadpatches-af9142dce07c8b5055b2306f330c32ed7f562458.tar
patches-af9142dce07c8b5055b2306f330c32ed7f562458.tar.gz
tests: Fix typo in guix-build.sh.
* tests/guix-build.sh: Refer to the '%bootstrap' variables from (gnu packages bootstrap), not (gnu packages base).
-rw-r--r--tests/guix-build.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/guix-build.sh b/tests/guix-build.sh
index 7c6594775a..27b3fdc39e 100644
--- a/tests/guix-build.sh
+++ b/tests/guix-build.sh
@@ -31,18 +31,18 @@ if guix build -e '(@ (gnu packages bootstrap) %bootstrap-glibc)' -S
then false; else true; fi
# Should pass.
-guix build -e '(@@ (gnu packages base) %bootstrap-guile)' | \
+guix build -e '(@@ (gnu packages bootstrap) %bootstrap-guile)' | \
grep -e '-guile-'
guix build hello -d | \
grep -e '-hello-[0-9\.]\+\.drv$'
# Should all return valid log files.
-drv="`guix build -d -e '(@@ (gnu packages base) %bootstrap-guile)'`"
-out="`guix build -e '(@@ (gnu packages base) %bootstrap-guile)'`"
+drv="`guix build -d -e '(@@ (gnu packages bootstrap) %bootstrap-guile)'`"
+out="`guix build -e '(@@ (gnu packages bootstrap) %bootstrap-guile)'`"
log="`guix build --log-file $drv`"
echo "$log" | grep log/.*guile.*drv
test -f "$log"
-test "`guix build -e '(@@ (gnu packages base) %bootstrap-guile)' --log-file`" \
+test "`guix build -e '(@@ (gnu packages bootstrap) %bootstrap-guile)' --log-file`" \
= "$log"
test "`guix build --log-file guile-bootstrap`" = "$log"
test "`guix build --log-file $out`" = "$log"
@@ -53,11 +53,11 @@ if guix build hello-0.0.1 -n; then false; else true; fi
# Keep a symlink to the result, registered as a root.
result="t-result-$$"
guix build -r "$result" \
- -e '(@@ (gnu packages base) %bootstrap-guile)'
+ -e '(@@ (gnu packages bootstrap) %bootstrap-guile)'
test -x "$result/bin/guile"
# Should fail, because $result already exists.
-if guix build -r "$result" -e '(@@ (gnu packages base) %bootstrap-guile)'
+if guix build -r "$result" -e '(@@ (gnu packages bootstrap) %bootstrap-guile)'
then false; else true; fi
rm -f "$result"