From cec50290bf5537d574fd94557bd3918f2bea8a30 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 3 Sep 2019 15:45:32 +0200
Subject: gc-auto.sh: Add some more instrumentation

---
 tests/gc-auto.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tests/gc-auto.sh')

diff --git a/tests/gc-auto.sh b/tests/gc-auto.sh
index 54ead227e..5c8be7c0e 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
 
-- 
cgit v1.2.3


From 08ee36495087e3d6f573615c050497ec2298cafa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 3 Sep 2019 18:11:43 +0200
Subject: gc-auto.sh: More test fixes

---
 tests/gc-auto.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'tests/gc-auto.sh')

diff --git a/tests/gc-auto.sh b/tests/gc-auto.sh
index 5c8be7c0e..87f1d6798 100644
--- a/tests/gc-auto.sh
+++ b/tests/gc-auto.sh
@@ -23,10 +23,13 @@ with import ./config.nix; mkDerivation {
     echo foo > \$out/bar
     echo 1...
     sleep 2
-    echo 200 > $fake_free
+    echo 200 > ${fake_free}.tmp1
+    mv ${fake_free}.tmp1 $fake_free
     echo 2...
-    sleep 2
+    sleep 1
     echo 3...
+    sleep 1
+    echo 4...
     [[ \$(ls \$NIX_STORE/*-garbage? | wc -l) = 1 ]]
   '';
 }
@@ -42,10 +45,13 @@ with import ./config.nix; mkDerivation {
     echo foo > \$out/bar
     echo 1...
     sleep 2
-    echo 200 > $fake_free
+    echo 200 > ${fake_free}.tmp2
+    mv ${fake_free}.tmp2 $fake_free
     echo 2...
-    sleep 2
+    sleep 1
     echo 3...
+    sleep 1
+    echo 4...
   '';
 }
 EOF
-- 
cgit v1.2.3


From 5fad9d01c242ffa9d83cddeeacb9abbaa3848c7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 4 Sep 2019 12:52:54 +0200
Subject: gc-auto.sh: Increase sleep time

---
 tests/gc-auto.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/gc-auto.sh')

diff --git a/tests/gc-auto.sh b/tests/gc-auto.sh
index 87f1d6798..de1e2cfe4 100644
--- a/tests/gc-auto.sh
+++ b/tests/gc-auto.sh
@@ -26,9 +26,9 @@ with import ./config.nix; mkDerivation {
     echo 200 > ${fake_free}.tmp1
     mv ${fake_free}.tmp1 $fake_free
     echo 2...
-    sleep 1
+    sleep 2
     echo 3...
-    sleep 1
+    sleep 2
     echo 4...
     [[ \$(ls \$NIX_STORE/*-garbage? | wc -l) = 1 ]]
   '';
@@ -48,9 +48,9 @@ with import ./config.nix; mkDerivation {
     echo 200 > ${fake_free}.tmp2
     mv ${fake_free}.tmp2 $fake_free
     echo 2...
-    sleep 1
+    sleep 2
     echo 3...
-    sleep 1
+    sleep 2
     echo 4...
   '';
 }
-- 
cgit v1.2.3