forked from rpms/e2fsprogs
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
|
From af09db229f74f447aec12e440252d8a94c049f26 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Theodore Ts'o <tytso@mit.edu>
|
||
|
|
Date: Mon, 3 Jan 2022 22:45:37 -0500
|
||
|
|
Subject: [PATCH] tests: support older versions of timeout in r_corrupt_fs
|
||
|
|
|
||
|
|
Older versions of the timeout program in coreutils don't support the
|
||
|
|
-v option. (This is apparently still in use in the GNU/FreeBSD Debain
|
||
|
|
port since coreutils hasn't built successfully since Coreutils version
|
||
|
|
8.28.)
|
||
|
|
|
||
|
|
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
||
|
|
---
|
||
|
|
tests/r_corrupt_fs/script | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tests/r_corrupt_fs/script b/tests/r_corrupt_fs/script
|
||
|
|
index 08af91ed..f6d3a89d 100644
|
||
|
|
--- a/tests/r_corrupt_fs/script
|
||
|
|
+++ b/tests/r_corrupt_fs/script
|
||
|
|
@@ -17,7 +17,7 @@ $MKE2FS -q -F -t ext4 -o Linux -b 1024 $TMPFILE 32M >> $OUT.new 2>&1
|
||
|
|
echo debugfs -w -R \"set_bg 1 free_blocks_count 65536\" /tmp/foo.img >> $OUT.new
|
||
|
|
$DEBUGFS -w -R "set_bg 1 free_blocks_count 65536" $TMPFILE > /dev/null 2>&1
|
||
|
|
|
||
|
|
-if type timeout > /dev/null 2>&1 ; then
|
||
|
|
+if timeout -v 1s true > /dev/null 2>&1 ; then
|
||
|
|
TIMEOUT="timeout -v 30s"
|
||
|
|
else
|
||
|
|
TIMEOUT=
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|