From 98df735b5149bc1e39ce6b0bae13fbf7cebcdc05 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 9 Feb 2005 12:57:13 +0000 Subject: * Propagate the deriver of a path through the substitute mechanism. * Removed some dead code (successor stuff) from nix-push. * Updated terminology in the tests (store expr -> drv path). * Check that the deriver is set properly in the tests. --- tests/locking.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/locking.sh') diff --git a/tests/locking.sh b/tests/locking.sh index 5cafa2910e6f..eeac569b81c1 100644 --- a/tests/locking.sh +++ b/tests/locking.sh @@ -1,15 +1,15 @@ -storeExpr=$($TOP/src/nix-instantiate/nix-instantiate locking.nix) +drvPath=$($TOP/src/nix-instantiate/nix-instantiate locking.nix) -echo "store expr is $storeExpr" +echo "derivation is $drvPath" for i in 1 2 3 4 5; do echo "WORKER $i" - $TOP/src/nix-store/nix-store -rvv "$storeExpr" & + $TOP/src/nix-store/nix-store -rvv "$drvPath" & done sleep 5 -outPath=$($TOP/src/nix-store/nix-store -qvvf "$storeExpr") +outPath=$($TOP/src/nix-store/nix-store -qvvf "$drvPath") echo "output path is $outPath" -- cgit 1.4.1