From b6120d26a84a69755c049ca5115b4388239d4540 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 28 Aug 2019 22:19:31 +0200
Subject: gc-auto.sh: Increase verbosity

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

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

diff --git a/tests/gc-auto.sh b/tests/gc-auto.sh
index 1e91282d0..4b1f6374a 100644
--- a/tests/gc-auto.sh
+++ b/tests/gc-auto.sh
@@ -29,7 +29,7 @@ with import ./config.nix; mkDerivation {
 EOF
 )
 
-nix build -o $TEST_ROOT/result-A -L "($expr)" \
+nix build -v -o $TEST_ROOT/result-A -L "($expr)" \
     --min-free 1000 --max-free 2000 --min-free-check-interval 1 &
 pid=$!
 
@@ -50,7 +50,7 @@ with import ./config.nix; mkDerivation {
 EOF
 )
 
-nix build -o $TEST_ROOT/result-B -L "($expr2)" \
+nix build -v -o $TEST_ROOT/result-B -L "($expr2)" \
     --min-free 1000 --max-free 2000 --min-free-check-interval 1
 
 wait "$pid"
-- 
cgit v1.2.3


From ecb0a23d51e46e2e0180850bdc8ad6cb7cc3d13f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 29 Aug 2019 12:10:01 +0200
Subject: Add some more instrumentation

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

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

diff --git a/tests/gc-auto.sh b/tests/gc-auto.sh
index 4b1f6374a..49894bc68 100644
--- a/tests/gc-auto.sh
+++ b/tests/gc-auto.sh
@@ -6,6 +6,9 @@ garbage1=$(nix add-to-store --name garbage1 ./tarball.sh)
 garbage2=$(nix add-to-store --name garbage2 ./tarball.sh)
 garbage3=$(nix add-to-store --name garbage3 ./tarball.sh)
 
+ls -l $garbage3
+du $garbage3
+
 fake_free=$TEST_ROOT/fake-free
 export _NIX_TEST_FREE_SPACE_FILE=$fake_free
 echo 1100 > $fake_free
-- 
cgit v1.2.3


From 31f5ecfaa5bce2282f50daed1e4f477c64705fb3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 29 Aug 2019 12:35:15 +0200
Subject: Maybe fix #3058

---
 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 49894bc68..68b7219f2 100644
--- a/tests/gc-auto.sh
+++ b/tests/gc-auto.sh
@@ -2,12 +2,12 @@ source common.sh
 
 clearStore
 
-garbage1=$(nix add-to-store --name garbage1 ./tarball.sh)
-garbage2=$(nix add-to-store --name garbage2 ./tarball.sh)
-garbage3=$(nix add-to-store --name garbage3 ./tarball.sh)
+garbage1=$(nix add-to-store --name garbage1 ./nar-access.sh)
+garbage2=$(nix add-to-store --name garbage2 ./nar-access.sh)
+garbage3=$(nix add-to-store --name garbage3 ./nar-access.sh)
 
 ls -l $garbage3
-du $garbage3
+POSIXLY_CORRECT=1 du $garbage3
 
 fake_free=$TEST_ROOT/fake-free
 export _NIX_TEST_FREE_SPACE_FILE=$fake_free
-- 
cgit v1.2.3


From a2c4fcd5e9782dc8d2998773380c7171ee53b813 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 29 Aug 2019 14:49:58 +0200
Subject: Don't rely on st_blocks

It doesn't seem very reliable on ZFS.
---
 tests/gc-auto.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/tests/gc-auto.sh b/tests/gc-auto.sh
index 68b7219f2..54ead227e 100644
--- a/tests/gc-auto.sh
+++ b/tests/gc-auto.sh
@@ -22,7 +22,7 @@ with import ./config.nix; mkDerivation {
     echo foo > \$out/bar
     echo 1...
     sleep 2
-    echo 100 > $fake_free
+    echo 200 > $fake_free
     echo 2...
     sleep 2
     echo 3...
@@ -44,7 +44,7 @@ with import ./config.nix; mkDerivation {
     echo foo > \$out/bar
     echo 1...
     sleep 2
-    echo 100 > $fake_free
+    echo 200 > $fake_free
     echo 2...
     sleep 2
     echo 3...
-- 
cgit v1.2.3