aboutsummaryrefslogtreecommitdiff
path: root/test-env.in
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-10-09 13:38:16 +0200
committerLudovic Courtès <ludo@gnu.org>2014-10-09 23:51:19 +0200
commit4938b0eead9b1f34883c166a16c769a5db03edd9 (patch)
tree6dca363040a808a928086c927106dac177efd898 /test-env.in
parent9176607ec4cffb85b46e71af49bbc8a330aec5c3 (diff)
downloadguix-4938b0eead9b1f34883c166a16c769a5db03edd9.tar
guix-4938b0eead9b1f34883c166a16c769a5db03edd9.tar.gz
substitute-binary: Ignore $GUIX_BINARY_SUBSTITUTE_URL.
* guix/scripts/substitute-binary.scm (%cache-url): Ignore the 'GUIX_BINARY_SUBSTITUTE_URL' environment variable. * test-env.in: Invoke 'guix-daemon' with '--substitute-urls'. * tests/substitute-binary.scm: Set '%cache-url' to the value of 'GUIX_BINARY_SUBSTITUTE_URL'.
Diffstat (limited to 'test-env.in')
-rw-r--r--test-env.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/test-env.in b/test-env.in
index 302118bb6f..792830c29b 100644
--- a/test-env.in
+++ b/test-env.in
@@ -81,7 +81,8 @@ then
# Launch the daemon without chroot support because is may be
# unavailable, for instance if we're not running as root.
"@abs_top_builddir@/pre-inst-env" \
- "@abs_top_builddir@/guix-daemon" --disable-chroot &
+ "@abs_top_builddir@/guix-daemon" --disable-chroot \
+ --substitute-urls="$GUIX_BINARY_SUBSTITUTE_URL" &
daemon_pid=$!
trap "kill $daemon_pid ; rm -rf $NIX_STATE_DIR" EXIT