diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-01-08 22:06:54 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-01-08 22:06:54 +0100 |
| commit | 2f265602ff23e41f75932aa568fe62e149e3cb9d (patch) | |
| tree | 3ff7d0b4be81246a4dfd3df414e163d8cbdc4990 /test-env.in | |
| parent | aa6b0d6bf01aba60c6b5524e4422e7a4cebf01e4 (diff) | |
| parent | 1d6816f98ca1746f0b627a6dee9c0adbbf7533c4 (diff) | |
| download | guix-2f265602ff23e41f75932aa568fe62e149e3cb9d.tar guix-2f265602ff23e41f75932aa568fe62e149e3cb9d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'test-env.in')
| -rw-r--r-- | test-env.in | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/test-env.in b/test-env.in index 9224a80537..df73ecdc7a 100644 --- a/test-env.in +++ b/test-env.in @@ -40,6 +40,22 @@ then # Currently, in Nix builds, we're at ~106 chars... NIX_STATE_DIR="@GUIX_TEST_ROOT@/var/$$" + # The configuration directory, for import/export signing keys. + NIX_CONF_DIR="@GUIX_TEST_ROOT@/etc" + if [ ! -d "$NIX_CONF_DIR" ] + 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 "$NIX_CONF_DIR" + cp "@abs_top_srcdir@/tests/signing-key.sec" \ + "@abs_top_srcdir@/tests/signing-key.pub" \ + "$NIX_CONF_DIR" + 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" @@ -51,7 +67,7 @@ then 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 \ - XDG_CACHE_HOME + NIX_CONF_DIR NIX_LIBEXEC_DIR XDG_CACHE_HOME # Do that because store.scm calls `canonicalize-path' on it. mkdir -p "$NIX_STORE_DIR" |