substitute-binary: Avoid the term "narinfo" in user messages.

[jackhill/guix/guix.git] / test-env.in

diff --git a/test-env.in b/test-env.in
index df73ecd..a3b3536 100644 (file)
--- a/test-env.in
+++ b/test-env.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -30,7 +30,7 @@ then
     NIX_IGNORE_SYMLINK_STORE=1 # in case the store is a symlink
     NIX_STORE_DIR="@GUIX_TEST_ROOT@/store"
     NIX_LOCALSTATE_DIR="@GUIX_TEST_ROOT@/var"
-    NIX_LOG_DIR="@GUIX_TEST_ROOT@/var/log/nix"
+    NIX_LOG_DIR="@GUIX_TEST_ROOT@/var/log/guix"
     NIX_DB_DIR="@GUIX_TEST_ROOT@/db"
     NIX_ROOT_FINDER="@abs_top_builddir@/nix/scripts/list-runtime-roots"
 
@@ -53,21 +53,23 @@ then
        chmod 400 "$NIX_CONF_DIR/signing-key.sec"
     fi
 
-    # For 'guix-authenticate'.
-    NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts"
-
     # A place to store data of the substituter.
     GUIX_BINARY_SUBSTITUTE_URL="file://$NIX_STATE_DIR/substituter-data"
     rm -rf "$NIX_STATE_DIR/substituter-data"
     mkdir -p "$NIX_STATE_DIR/substituter-data"
 
+    # For a number of tests, we want to allow unsigned narinfos, for
+    # simplicity.
+    GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES=yes
+
     # Place for the substituter's cache.
     XDG_CACHE_HOME="$NIX_STATE_DIR/cache-$$"
 
     export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR                      \
        NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR         \
        NIX_ROOT_FINDER NIX_SETUID_HELPER GUIX_BINARY_SUBSTITUTE_URL    \
-        NIX_CONF_DIR NIX_LIBEXEC_DIR XDG_CACHE_HOME
+        GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES                         \
+        NIX_CONF_DIR XDG_CACHE_HOME
 
     # Do that because store.scm calls `canonicalize-path' on it.
     mkdir -p "$NIX_STORE_DIR"