diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-02-06 16:31:39 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-02-06 23:04:10 +0100 |
| commit | 44ce77ff52b0456e71ccaabbf3900e71d7a5841f (patch) | |
| tree | 774fb3f488acbd7d1d8e316eb7169f23cd799feb | |
| parent | 8dc2ecfcd915f8834c9b3d8b9821ac1d58dd664c (diff) | |
| download | patches-44ce77ff52b0456e71ccaabbf3900e71d7a5841f.tar patches-44ce77ff52b0456e71ccaabbf3900e71d7a5841f.tar.gz | |
guix-package: Test installation of packages by name.
* tests/guix-package.sh: Remove `boot_guile'. Replace occurrences of
$boot_guile by the `guile-bootstrap' package name.
| -rw-r--r-- | tests/guix-package.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/guix-package.sh b/tests/guix-package.sh index 42a1f8da96..617318b796 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -33,14 +33,12 @@ rm -f "$profile" trap 'rm "$profile" "$profile-"[0-9]* ; rm -rf t-home-'"$$" EXIT -boot_guile="`guix-build -e '(@ (gnu packages bootstrap) %bootstrap-guile)'`" - -guix-package --bootstrap -p "$profile" -i "$boot_guile" +guix-package --bootstrap -p "$profile" -i guile-bootstrap test -L "$profile" && test -L "$profile-1-link" test -f "$profile/bin/guile" # Installing the same package a second time does nothing. -guix-package --bootstrap -p "$profile" -i "$boot_guile" +guix-package --bootstrap -p "$profile" -i guile-bootstrap test -L "$profile" && test -L "$profile-1-link" ! test -f "$profile-2-link" test -f "$profile/bin/guile" @@ -101,7 +99,7 @@ then test -x "$profile/bin/guile" && ! test -x "$profile/bin/make" # Roll-back to generation 0, and install---all at once. - guix-package --bootstrap -p "$profile" --roll-back -i "$boot_guile" + guix-package --bootstrap -p "$profile" --roll-back -i guile-bootstrap test "`readlink_base "$profile"`" = "$profile-1-link" test -x "$profile/bin/guile" && ! test -x "$profile/bin/make" @@ -141,7 +139,7 @@ export HOME mkdir -p "$HOME" -guix-package --bootstrap -i "$boot_guile" +guix-package --bootstrap -i guile-bootstrap test -L "$HOME/.guix-profile" test -f "$HOME/.guix-profile/bin/guile" |