diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-02-09 12:57:13 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-02-09 12:57:13 +0000 |
| commit | 98df735b5149bc1e39ce6b0bae13fbf7cebcdc05 (patch) | |
| tree | 9a9549e0689400b71e230ba51317a2590969b63d /tests/gc-concurrent.sh | |
| parent | 582e01c06f9ecee25a31c34562926b41dc2856eb (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/gc-concurrent.sh')
| -rw-r--r-- | tests/gc-concurrent.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/gc-concurrent.sh b/tests/gc-concurrent.sh index b3fb06535..8cc24565d 100644 --- a/tests/gc-concurrent.sh +++ b/tests/gc-concurrent.sh @@ -1,17 +1,17 @@ -storeExpr1=$($TOP/src/nix-instantiate/nix-instantiate gc-concurrent.nix) -outPath1=$($TOP/src/nix-store/nix-store -q $storeExpr1) +drvPath1=$($TOP/src/nix-instantiate/nix-instantiate gc-concurrent.nix) +outPath1=$($TOP/src/nix-store/nix-store -q $drvPath1) -storeExpr2=$($TOP/src/nix-instantiate/nix-instantiate gc-concurrent2.nix) -outPath2=$($TOP/src/nix-store/nix-store -q $storeExpr2) +drvPath2=$($TOP/src/nix-instantiate/nix-instantiate gc-concurrent2.nix) +outPath2=$($TOP/src/nix-store/nix-store -q $drvPath2) -ln -s $storeExpr2 "$NIX_STATE_DIR"/gcroots/foo2 +ln -s $drvPath2 "$NIX_STATE_DIR"/gcroots/foo2 # Start build #1 in the background. It starts immediately. -$TOP/src/nix-store/nix-store -rvv "$storeExpr1" & +$TOP/src/nix-store/nix-store -rvv "$drvPath1" & pid1=$! # Start build #2 in the background after 3 seconds. -(sleep 3 && $TOP/src/nix-store/nix-store -rvv "$storeExpr2") & +(sleep 3 && $TOP/src/nix-store/nix-store -rvv "$drvPath2") & pid2=$! # Run the garbage collector while the build is running. Note: the GC |