about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-09-03T13·45+0200
committerEelco Dolstra <edolstra@gmail.com>2019-09-03T13·45+0200
commitcec50290bf5537d574fd94557bd3918f2bea8a30 (patch)
tree5c82ab963d6a67efc5bd50816139b09ed11dac35
parentf186000367978fbe590343f47951232f42a30bec (diff)
gc-auto.sh: Add some more instrumentation
-rw-r--r--tests/gc-auto.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/gc-auto.sh b/tests/gc-auto.sh
index 54ead227ef62..5c8be7c0ecfc 100644
--- a/tests/gc-auto.sh
+++ b/tests/gc-auto.sh
@@ -17,6 +17,7 @@ expr=$(cat <<EOF
 with import ./config.nix; mkDerivation {
   name = "gc-A";
   buildCommand = ''
+    set -x
     [[ \$(ls \$NIX_STORE/*-garbage? | wc -l) = 3 ]]
     mkdir \$out
     echo foo > \$out/bar
@@ -32,14 +33,11 @@ with import ./config.nix; mkDerivation {
 EOF
 )
 
-nix build -v -o $TEST_ROOT/result-A -L "($expr)" \
-    --min-free 1000 --max-free 2000 --min-free-check-interval 1 &
-pid=$!
-
 expr2=$(cat <<EOF
 with import ./config.nix; mkDerivation {
   name = "gc-B";
   buildCommand = ''
+    set -x
     mkdir \$out
     echo foo > \$out/bar
     echo 1...
@@ -53,6 +51,10 @@ with import ./config.nix; mkDerivation {
 EOF
 )
 
+nix build -v -o $TEST_ROOT/result-A -L "($expr)" \
+    --min-free 1000 --max-free 2000 --min-free-check-interval 1 &
+pid=$!
+
 nix build -v -o $TEST_ROOT/result-B -L "($expr2)" \
     --min-free 1000 --max-free 2000 --min-free-check-interval 1