aboutsummaryrefslogtreecommitdiff
path: root/tests/locking.sh
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2005-02-09 12:57:13 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2005-02-09 12:57:13 +0000
commit98df735b5149bc1e39ce6b0bae13fbf7cebcdc05 (patch)
tree9a9549e0689400b71e230ba51317a2590969b63d /tests/locking.sh
parent582e01c06f9ecee25a31c34562926b41dc2856eb (diff)
* 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.
Diffstat (limited to 'tests/locking.sh')
-rw-r--r--tests/locking.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/locking.sh b/tests/locking.sh
index 5cafa2910..eeac569b8 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"