On 19/01/2026 11:46, Pádraig Brady wrote:
On 18/01/2026 22:06, Collin Funk wrote:
* tests/misc/sync.sh: Check 'sync fifo' with no arguments, -d, and -f
separately.
---
tests/misc/sync.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/misc/sync.sh b/tests/misc/sync.sh
index b3785e0f3..a7cace6fd 100755
--- a/tests/misc/sync.sh
+++ b/tests/misc/sync.sh
@@ -52,7 +52,9 @@ fi
if test "$fail" != '1'; then
# Ensure a fifo doesn't block
mkfifo_or_skip_ fifo
- returns_ 124 timeout 10 sync fifo && fail=1
+ for opt in '' '-f' '-d'; do
+ returns_ 124 timeout 10 sync $opt fifo && fail=1
+ done
fi
Exit $fail
sync -f is potentially expensive.
Perhaps add this line as the first in the loop?
test "$opt" = '-f' && test "$RUN_EXPENSIVE_TESTS" != yes && continue
This is even more expensive as I just noticed a false failure on cfarm13
due to the delay in sync'ing the whole file system.
So I'll apply this to both increase the timeout and exclude the check
unless RUN_VERY_EXPENSIVE_TESTS is enabled.
cheers,
Padraig
diff --git a/tests/misc/sync.sh b/tests/misc/sync.sh
index fa2ca86fa..df715ee6e 100755
--- a/tests/misc/sync.sh
+++ b/tests/misc/sync.sh
@@ -61,8 +61,12 @@ if test "$fail" != '1'; then
# Ensure a fifo doesn't block
mkfifo_or_skip_ fifo
for opt in '' '-f' '-d'; do
- test "$opt" = '-f' && test "$RUN_EXPENSIVE_TESTS" != yes && continue
- returns_ 124 timeout 10 sync $opt fifo && fail=1
+ timeout=10
+ if test "$opt" = '-f'; then
+ test "$RUN_VERY_EXPENSIVE_TESTS" = yes || continue
+ timeout=60
+ fi
+ returns_ 124 timeout $timeout sync $opt fifo && fail=1
done
fi
