about summary refs log tree commit diff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2004-05-04T17·04+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-05-04T17·04+0000
commita9858c9f26c5be743e0bbe1949954f6bd2497306 (patch)
tree9ee029ebea9b1ce561eff31a3a6ccfa9b5f26ae5 /tests/Makefile.am
parentf044ccf7025137ec541e165e7988772f27080a23 (diff)
* A test to verify that Nix executes build jobs in parallel, if
  possible.

  This test fails right now because this hasn't been implemented right
  now.  Yes, I'm doing Test-Driven Development! ;-)

Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am12
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ba45a3ad8fd0..d540290b4944 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,7 @@
 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 \
@@ -7,19 +9,23 @@ TESTS_ENVIRONMENT = TEST_ROOT=$(TEST_ROOT) \
   NIX_STATE_DIR=$(TEST_ROOT)/state \
   NIX_DB_DIR=$(TEST_ROOT)/db \
   TOP=$(shell pwd)/.. \
+  SHARED=$(extra1) \
   $(SHELL) -e -x
 
 simple.sh: simple.nix
 dependencies.sh: dependencies.nix
 locking.sh: locking.nix
+parallel.sh: parallel.nix
 
-TESTS = init.sh simple.sh dependencies.sh locking.sh
+TESTS = init.sh simple.sh dependencies.sh parallel.sh
+#locking.sh parallel.sh
 
-XFAIL_TESTS =
+XFAIL_TESTS = parallel.sh
 
 include ../substitute.mk
 
 EXTRA_DIST = $(TESTS) \
   simple.nix.in simple.builder.sh \
   dependencies.nix.in dependencies.builder*.sh \
-  locking.nix.in locking.builder.sh
\ No newline at end of file
+  locking.nix.in locking.builder.sh \
+  parallel.nix.in parallel.builder.sh