From a4c63c6e8e161d55778b797e566d9eca7c47f34f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed, 1 Mar 2006 12:15:33 +0000
Subject: * Make it easy to run individual tests from the command line.

---
 tests/Makefile.am | 35 +++++------------------------------
 1 file changed, 5 insertions(+), 30 deletions(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 933da520b460..d8493496d2b3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,29 +1,4 @@
-TEST_ROOT = $(shell pwd)/test-tmp
-
-extra1 = $(TEST_ROOT)/shared
-
-TESTS_ENVIRONMENT = TEST_ROOT=$(TEST_ROOT) \
-  NIX_STORE_DIR=$(TEST_ROOT)/store \
-  NIX_DATA_DIR=$(TEST_ROOT)/data \
-  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_CONF_DIR=$(TEST_ROOT)/etc \
-  NIX_BIN_DIR=$(TEST_ROOT)/bin \
-  NIX_LIBEXEC_DIR=$(TEST_ROOT)/bin \
-  REAL_BIN_DIR=$(bindir) \
-  REAL_LIBEXEC_DIR=$(libexecdir) \
-  REAL_LOCALSTATE_DIR=$(localstatedir) \
-  REAL_DATA_DIR=$(datadir) \
-  REAL_STORE_DIR=$(storedir) \
-  NIX_BUILD_HOOK= \
-  PERL=$(perl) \
-  TOP=$(shell pwd)/.. \
-  SHARED=$(extra1) \
-  aterm_bin=$(aterm_bin) \
-  dot=$(dot) \
-  $(SHELL) -e
+TESTS_ENVIRONMENT = $(SHELL) -e
 
 simple.sh: simple.nix
 dependencies.sh: dependencies.nix
@@ -45,11 +20,10 @@ TESTS = init.sh hash.sh lang.sh simple.sh dependencies.sh locking.sh parallel.sh
 
 XFAIL_TESTS =
 
-langtests:
-	$(TESTS_ENVIRONMENT) ./lang.sh
-
 include ../substitute.mk
 
+$(TESTS): common.sh
+
 EXTRA_DIST = $(TESTS) \
   simple.nix.in simple.builder.sh \
   dependencies.nix.in dependencies.builder*.sh \
@@ -62,4 +36,5 @@ EXTRA_DIST = $(TESTS) \
   gc-concurrent2.nix.in gc-concurrent2.builder.sh \
   fallback.nix.in \
   user-envs.nix.in user-envs.builder.sh \
-  $(wildcard lang/*.nix) $(wildcard lang/*.exp)
+  $(wildcard lang/*.nix) $(wildcard lang/*.exp) \
+  common.sh.in
-- 
cgit 1.4.1