diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-12-13 22:14:25 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-13 22:14:25 +0100 |
commit | 1e9824513c570370638b1bfe33bf1dba1f12be4a (patch) | |
tree | cb7bd7f0bebd42dbeabf2c8f09ae1d5144ac969b /tests/utils.scm | |
parent | 70915c1a2ef72e7350b2a29d1d93e30643bce6f3 (diff) | |
parent | b35c0f866c83288e64dcf5839d908705d416c317 (diff) | |
download | patches-1e9824513c570370638b1bfe33bf1dba1f12be4a.tar patches-1e9824513c570370638b1bfe33bf1dba1f12be4a.tar.gz |
Merge branch 'nix-integration'
Conflicts:
tests/guix-package.sh
Diffstat (limited to 'tests/utils.scm')
-rw-r--r-- | tests/utils.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/utils.scm b/tests/utils.scm index 0a6e8a0833..ba04e281eb 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -18,7 +18,7 @@ (define-module (test-utils) #:use-module (guix utils) - #:use-module ((guix store) #:select (store-path-package-name)) + #:use-module ((guix store) #:select (%store-prefix store-path-package-name)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-64) @@ -127,7 +127,8 @@ (test-equal "store-path-package-name" "bash-4.2-p24" (store-path-package-name - "/nix/store/qvs2rj2ia5vci3wsdb7qvydrmacig4pg-bash-4.2-p24")) + (string-append (%store-prefix) + "/qvs2rj2ia5vci3wsdb7qvydrmacig4pg-bash-4.2-p24"))) (test-end) |