summary refs log tree commit diff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-10-17 23:25:03 +0200
committerLudovic Courtès <ludo@gnu.org>2012-10-17 23:25:23 +0200
commit9b9b6f3d51fe5a4fed4ee8f5eda96a0f350e751b (patch)
tree8e523b235b0867c1d89d28e75f324501bd57f3c8 /Makefile.am
parent8587b54268f47a63f4a52f3b520fa9beabec51d8 (diff)
downloadguix-9b9b6f3d51fe5a4fed4ee8f5eda96a0f350e751b.tar.gz
build: Use `pre-inst-env' to run tests.
* Makefile.am (TESTS_ENVIRONMENT): Remove.
  (LOG_COMPILER): Use `pre-inst-env'.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am9
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 2bb8d48ed9..b0b071a8d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,15 +70,8 @@ TESTS =						\
   tests/build-utils.scm				\
   tests/packages.scm
 
-TESTS_ENVIRONMENT =								\
-  NIX_HASH="$(NIX_HASH)";							\
-  NIX_INSTANTIATE="$(NIX_INSTANTIATE)";						\
-  NIXPKGS="$(NIXPKGS)";								\
-  DISTRO_PATCH_DIRECTORY="$(top_srcdir)/distro/patches"				\
-  GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH";	\
-  export NIX_HASH NIX_INSTANTIATE NIXPKGS GUILE_LOAD_COMPILED_PATH;
-
 LOG_COMPILER =					\
+  $(top_builddir)/pre-inst-env			\
   $(GUILE) --no-auto-compile -L "$(top_srcdir)"
 
 EXTRA_DIST =					\