From 8f1dcdfc0ae05c403fe59b592093d3e61e87f1b0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Aug 2004 09:09:09 +0000 Subject: [PATCH] * 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. --- tests/Makefile.am | 1 + tests/locking.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9e1d6a198..5ac01aca3 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 ac515fcea..f89e1240b 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