about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2009-03-27T22·40+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2009-03-27T22·40+0000
commit38f98b32822efa35a050b26d7ab5bbd561c9e529 (patch)
tree7df3a24a6fbb7912991965b6e88ef459d8519ea7
parente23a7a8b7b37f493327b7f73350140811cccdb37 (diff)
* Argh, stupid timing sensitive tests...
-rw-r--r--tests/gc-concurrent.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/gc-concurrent.sh b/tests/gc-concurrent.sh
index aee07bc57a57..74251d7cbc08 100644
--- a/tests/gc-concurrent.sh
+++ b/tests/gc-concurrent.sh
@@ -1,6 +1,6 @@
 source common.sh
 
-$NIX_BIN_DIR/nix-collect-garbage
+clearStore
 
 drvPath1=$($nixinstantiate gc-concurrent.nix -A test1)
 outPath1=$($nixstore -q $drvPath1)
@@ -22,12 +22,12 @@ ln -s $outPath3 "$NIX_STATE_DIR"/gcroots/foo2
 $nixstore -rvv "$drvPath1" &
 pid1=$!
 
-# Start build #2 in the background after 6 seconds.
-(sleep 6 && $nixstore -rvv "$drvPath2") &
+# Start build #2 in the background after 10 seconds.
+(sleep 10 && $nixstore -rvv "$drvPath2") &
 pid2=$!
 
 # Run the garbage collector while the build is running.
-sleep 4
+sleep 6
 $NIX_BIN_DIR/nix-collect-garbage
 
 # Wait for build #1/#2 to finish.