[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: maint: "distcheck" inherits the test root directory.
From: |
Ludovic Courtès |
Subject: |
03/07: maint: "distcheck" inherits the test root directory. |
Date: |
Mon, 8 May 2017 10:29:32 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit ddce2d3aaea804604a32e6c4b70d78e6cc033df3
Author: Ludovic Courtès <address@hidden>
Date: Mon May 8 14:56:36 2017 +0200
maint: "distcheck" inherits the test root directory.
* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Add 'ac_cv_guix_test_root'.
---
Makefile.am | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e035045..6cc179f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -493,13 +493,17 @@ endif BUILD_DAEMON
ACLOCAL_AMFLAGS = -I m4
# Pass an explicit '--localstatedir' so that configure does not error out if
-# it finds an existing installation with a different localstatedir.
+# it finds an existing installation with a different localstatedir. Inherit
+# 'ac_cv_guix_test_root' so that "make check" in $(distdir) does not have to
+# repopulate the whole store, and to make sure $(GUIX_TEST_ROOT) is short
+# enough for shebangs.
AM_DISTCHECK_CONFIGURE_FLAGS = \
--localstatedir="$$dc_install_base/var" \
--with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)" \
--with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)" \
--with-nix-prefix="$(NIX_PREFIX)" \
- --enable-daemon
+ --enable-daemon \
+ ac_cv_guix_test_root="$(GUIX_TEST_ROOT)"
# The self-contained tarball. Add 'glibc-utf8-locales' along with glibc just
# so 'etc/profile' defines 'GUIX_LOCPATH' pointing to a valid set of locales.
- branch master updated (087efec -> a7e5944), Ludovic Courtès, 2017/05/08
- 02/07: maint: Use 'G_' in build-aux/ scripts., Ludovic Courtès, 2017/05/08
- 07/07: maint: Check whether binaries cross-built to "arm-linux-gnueabihf" are available., Ludovic Courtès, 2017/05/08
- 05/07: maint: Add bayfront.guixsd.org signing key., Ludovic Courtès, 2017/05/08
- 03/07: maint: "distcheck" inherits the test root directory.,
Ludovic Courtès <=
- 04/07: services: nscd: Adjust activation snippet for /etc/resolv.conf symlinks., Ludovic Courtès, 2017/05/08
- 01/07: gnu: perl-net-dns-resolver-programmable: Shorten patch file name., Ludovic Courtès, 2017/05/08
- 06/07: maint: 'check-available-binaries' forces use of the official servers., Ludovic Courtès, 2017/05/08