summary refs log tree commit diff
path: root/daemon.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-12-05 16:29:28 +0100
committerLudovic Courtès <ludo@gnu.org>2012-12-05 16:29:28 +0100
commitf5c82e15e0e76b855bc4cc88ffb79331b7083f39 (patch)
treebe5fa23b0899617c411afca2413655bb1d073ab7 /daemon.am
parent8b15ac6700f1345e9efa709dea6e4efcbdaf6d7a (diff)
downloadguix-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 'daemon.am')
-rw-r--r--daemon.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/daemon.am b/daemon.am
index 48b0871a97..f5d58ea275 100644
--- a/daemon.am
+++ b/daemon.am
@@ -146,6 +146,9 @@ nix/libstore/schema.sql.hh: nix/libstore/schema.sql
 	         (lambda (in)					\
 	           (write (get-string-all in) out)))))"
 
+nodist_pkglibexec_SCRIPTS =			\
+  nix/scripts/list-runtime-roots
+
 EXTRA_DIST +=					\
   nix/sync-with-upstream			\
   nix/libstore/schema.sql			\
@@ -156,6 +159,7 @@ EXTRA_DIST +=					\
 test_root = $(abs_top_builddir)/test-tmp
 
 AM_TESTS_ENVIRONMENT +=				\
+  top_builddir="$(abs_top_builddir)"		\
   TEST_ROOT="$(test_root)"
 
 TESTS +=					\