diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-05 16:29:28 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-05 16:29:28 +0100 |
| commit | f5c82e15e0e76b855bc4cc88ffb79331b7083f39 (patch) | |
| tree | be5fa23b0899617c411afca2413655bb1d073ab7 /tests | |
| parent | 8b15ac6700f1345e9efa709dea6e4efcbdaf6d7a (diff) | |
| download | gnu-guix-f5c82e15e0e76b855bc4cc88ffb79331b7083f39.tar gnu-guix-f5c82e15e0e76b855bc4cc88ffb79331b7083f39.tar.gz | |
daemon: Add `list-runtime-roots' script.
* nix/scripts/list-runtime-roots.in: New file.
* config-daemon.ac: Add `AC_CONFIG_FILES' invocation for it.
* daemon.am (nodist_pkglibexec_SCRIPTS): New variable.
(AM_TESTS_ENVIRONMENT): Define `top_builddir'.
* tests/guix-daemon.sh: Export `NIX_ROOT_FINDER'.
* nix/sync-with-upstream: Substitute the path to the root finder in
libstore/gc.cc.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-daemon.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/guix-daemon.sh b/tests/guix-daemon.sh index d7926b2376..b6b92a78d4 100644 --- a/tests/guix-daemon.sh +++ b/tests/guix-daemon.sh @@ -29,8 +29,10 @@ NIX_LOCALSTATE_DIR="$TEST_ROOT/var" NIX_LOG_DIR="$TEST_ROOT/var/log/nix" NIX_STATE_DIR="$TEST_ROOT/var/nix" NIX_DB_DIR="$TEST_ROOT/db" +NIX_ROOT_FINDER="$top_builddir/nix/scripts/list-runtime-roots" export NIX_SUBSTITUTERS NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR \ - NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR + NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR \ + NIX_ROOT_FINDER guix-daemon --version guix-build --version |