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-04T13·56+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-05-04T13·56+0000
commitf044ccf7025137ec541e165e7988772f27080a23 (patch)
tree90a3215c4c66682841ba628467e1863e20416fa8 /tests/Makefile.am
parenta7bbe739717c7419a374b29e6e4887325b1af7fd (diff)
* 1000th revision!
* A test to verify that locking of output paths (caused by concurrent
  invocations of Nix) works correctly.

Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2119221bbcc2..ba45a3ad8fd0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,11 +11,15 @@ TESTS_ENVIRONMENT = TEST_ROOT=$(TEST_ROOT) \
 
 simple.sh: simple.nix
 dependencies.sh: dependencies.nix
+locking.sh: locking.nix
 
-TESTS = init.sh simple.sh dependencies.sh
+TESTS = init.sh simple.sh dependencies.sh locking.sh
+
+XFAIL_TESTS =
 
 include ../substitute.mk
 
 EXTRA_DIST = $(TESTS) \
   simple.nix.in simple.builder.sh \
-  dependencies.nix.in dependencies.builder*.sh
+  dependencies.nix.in dependencies.builder*.sh \
+  locking.nix.in locking.builder.sh
\ No newline at end of file