gnu: Add go-github-com-itchyny-gojq.

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

diff --git a/build-aux/test-env.in b/build-aux/test-env.in
index 59ab58c..ca78643 100644 (file)
--- a/build-aux/test-env.in
+++ b/build-aux/test-env.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -73,9 +73,9 @@ then
        # Copy the keys so that the secret key has the right permissions (the
        # daemon errors out when this is not the case.)
        mkdir -p "$GUIX_CONFIGURATION_DIRECTORY"
-       cp "@abs_top_srcdir@/tests/signing-key.sec"     \
-           "@abs_top_srcdir@/tests/signing-key.pub"    \
-           "$GUIX_CONFIGURATION_DIRECTORY"
+       cp "@abs_top_srcdir@/tests/keys/signing-key.sec"        \
+          "@abs_top_srcdir@/tests/keys/signing-key.pub"        \
+          "$GUIX_CONFIGURATION_DIRECTORY"
        chmod 400 "$GUIX_CONFIGURATION_DIRECTORY/signing-key.sec"
     fi
 
@@ -91,14 +91,11 @@ then
     # Place for the substituter's cache.
     XDG_CACHE_HOME="$GUIX_STATE_DIRECTORY/cache-$$"
 
-    # For the (guix import snix) tests.
-    NIXPKGS="@NIXPKGS@"
-
     export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR              \
        GUIX_LOG_DIRECTORY GUIX_STATE_DIRECTORY GUIX_DATABASE_DIRECTORY \
        GUIX_BINARY_SUBSTITUTE_URL                              \
         GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES                 \
-        GUIX_CONFIGURATION_DIRECTORY XDG_CACHE_HOME NIXPKGS
+        GUIX_CONFIGURATION_DIRECTORY XDG_CACHE_HOME
 
     # Launch the daemon without chroot support because is may be
     # unavailable, for instance if we're not running as root.