From 88371f0d7dcdbb1bd304073257e5214409e89c2f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 5 Jul 2014 14:56:08 +0200 Subject: guix package: Do the right thing for '-p ~/.guix-profile'. Fixes . Reported by Taylan Ulrich Bayirli/Kammer . * guix/scripts/package.scm (canonicalize-profile): New procedure. (%options): Use it for --profile. * tests/guix-package.sh: Add test. --- tests/guix-package.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/guix-package.sh b/tests/guix-package.sh index de545801de..c9e0c08a22 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -189,7 +189,7 @@ test "`readlink_base "$profile"`" = "$generation" XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" export XDG_CACHE_HOME -HOME="t-home-$$" +HOME="$PWD/t-home-$$" export HOME mkdir -p "$HOME" @@ -224,6 +224,15 @@ do test "`readlink "$default_profile"`" = "$default_profile-0-link" done +# Check whether '-p ~/.guix-profile' makes any difference. +# See . +if test -e "$HOME/.guix-profile-0-link"; then false; fi +if test -e "$HOME/.guix-profile-1-link"; then false; fi +guix package --bootstrap -p "$HOME/.guix-profile" -i guile-bootstrap +if test -e "$HOME/.guix-profile-1-link"; then false; fi +guix package --bootstrap --roll-back -p "$HOME/.guix-profile" +if test -e "$HOME/.guix-profile-0-link"; then false; fi + # Extraneous argument. if guix package install foo-bar; then false; else true; fi -- cgit 1.4.1