* 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.
This commit is contained in:
parent
1eddee59f2
commit
8f1dcdfc0a
|
@ -8,6 +8,7 @@ TESTS_ENVIRONMENT = TEST_ROOT=$(TEST_ROOT) \
|
||||||
NIX_LOG_DIR=$(TEST_ROOT)/log \
|
NIX_LOG_DIR=$(TEST_ROOT)/log \
|
||||||
NIX_STATE_DIR=$(TEST_ROOT)/state \
|
NIX_STATE_DIR=$(TEST_ROOT)/state \
|
||||||
NIX_DB_DIR=$(TEST_ROOT)/db \
|
NIX_DB_DIR=$(TEST_ROOT)/db \
|
||||||
|
NIX_BUILD_HOOK= \
|
||||||
TOP=$(shell pwd)/.. \
|
TOP=$(shell pwd)/.. \
|
||||||
SHARED=$(extra1) \
|
SHARED=$(extra1) \
|
||||||
$(SHELL) -e -x
|
$(SHELL) -e -x
|
||||||
|
|
|
@ -2,7 +2,7 @@ storeExpr=$($TOP/src/nix-instantiate/nix-instantiate locking.nix)
|
||||||
|
|
||||||
echo "store expr is $storeExpr"
|
echo "store expr is $storeExpr"
|
||||||
|
|
||||||
for i in $(seq 1 5); do
|
for i in 1 2 3 4 5; do
|
||||||
echo "WORKER $i"
|
echo "WORKER $i"
|
||||||
$TOP/src/nix-store/nix-store -rvvvvvB "$storeExpr" &
|
$TOP/src/nix-store/nix-store -rvvvvvB "$storeExpr" &
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in a new issue