From 44ce77ff52b0456e71ccaabbf3900e71d7a5841f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Feb 2013 16:31:39 +0100 Subject: 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. --- tests/guix-package.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'tests/guix-package.sh') 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" -- cgit v1.2.3