From 9b9b6f3d51fe5a4fed4ee8f5eda96a0f350e751b Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 17 Oct 2012 23:25:03 +0200
Subject: build: Use `pre-inst-env' to run tests.

* Makefile.am (TESTS_ENVIRONMENT): Remove.
  (LOG_COMPILER): Use `pre-inst-env'.
---
 Makefile.am | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'Makefile.am')

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 =					\
-- 
cgit v1.2.3