diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-08-19T09·09+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-08-19T09·09+0000 |
| commit | 8f1dcdfc0ae05c403fe59b592093d3e61e87f1b0 (patch) | |
| tree | b55b1ab81dd16920b5e9b3832d69707d9b31b60b | |
| parent | 1eddee59f22b56a4b098921083780990dc1f0468 (diff) | |
* Make sure that no build hook is set by default in the tests.
* Don't use `seq' - some primitive, obsolete operating systems (Darwin) don't have it.
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/locking.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 9e1d6a19836a..5ac01aca3f4d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,6 +8,7 @@ TESTS_ENVIRONMENT = TEST_ROOT=$(TEST_ROOT) \ NIX_LOG_DIR=$(TEST_ROOT)/log \ NIX_STATE_DIR=$(TEST_ROOT)/state \ NIX_DB_DIR=$(TEST_ROOT)/db \ + NIX_BUILD_HOOK= \ TOP=$(shell pwd)/.. \ SHARED=$(extra1) \ $(SHELL) -e -x diff --git a/tests/locking.sh b/tests/locking.sh index ac515fcea480..f89e1240bde8 100644 --- a/tests/locking.sh +++ b/tests/locking.sh @@ -2,7 +2,7 @@ storeExpr=$($TOP/src/nix-instantiate/nix-instantiate locking.nix) echo "store expr is $storeExpr" -for i in $(seq 1 5); do +for i in 1 2 3 4 5; do echo "WORKER $i" $TOP/src/nix-store/nix-store -rvvvvvB "$storeExpr" & done |