X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/f07aa672fddd7b5405fc730ffebcda67daa71ae1..61771a79abb4a354d48469be9744f9537caefc96:/test-env.in

diff --git a/test-env.in b/test-env.in
index 34f57257d2..f66a0db555 100644
--- a/test-env.in
+++ b/test-env.in
@@ -24,6 +24,11 @@
 # `pre-inst-env'.  This is used to run unit tests with the just-built
 # daemon, unless `--disable-daemon' was passed at configure time.
 
+
+# Make sure 'cd' behaves deterministically and doesn't write anything to
+# stdout.
+unset CDPATH
+
 if [ -x "@abs_top_builddir@/guix-daemon" ]
 then
     NIX_SETUID_HELPER="@abs_top_builddir@/nix-setuid-helper" # normally unused
@@ -81,7 +86,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
@@ -93,6 +99,9 @@ unset LANGUAGE
 LC_MESSAGES=C
 export LC_MESSAGES
 
+# Ignore user settings.
+unset GUIX_PACKAGE_PATH GUIX_BUILD_OPTIONS
+
 storedir="@storedir@"
 prefix="@prefix@"
 datarootdir="@datarootdir@"