Whamcloud - gitweb
Update debian/changelog and debian/patches for the 1.46.5-2 release
[tools/e2fsprogs.git] / debian / patches / 0001-tests-support-older-versions-of-timeout-in-r_corrupt
1 From 8535250a8eeeb441cf466124cc420724935022eb Mon Sep 17 00:00:00 2001
2 From: Theodore Ts'o <tytso@mit.edu>
3 Date: Mon, 3 Jan 2022 22:45:37 -0500
4 Subject: [PATCH] tests: support older versions of timeout in r_corrupt_fs
5
6 Older versions of the timeout program in coreutils don't support the
7 -v option.  (This is apparently still in use in the GNU/FreeBSD Debain
8 port since coreutils hasn't built successfully since Coreutils version
9 8.28.)
10
11 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
12 ---
13  tests/r_corrupt_fs/script | 2 +-
14  1 file changed, 1 insertion(+), 1 deletion(-)
15
16 diff --git a/tests/r_corrupt_fs/script b/tests/r_corrupt_fs/script
17 index 08af91ed..f6d3a89d 100644
18 --- a/tests/r_corrupt_fs/script
19 +++ b/tests/r_corrupt_fs/script
20 @@ -17,7 +17,7 @@ $MKE2FS -q -F -t ext4 -o Linux -b 1024 $TMPFILE 32M >> $OUT.new 2>&1
21  echo debugfs -w -R \"set_bg 1 free_blocks_count 65536\" /tmp/foo.img >> $OUT.new
22  $DEBUGFS -w -R "set_bg 1 free_blocks_count 65536" $TMPFILE > /dev/null 2>&1
23  
24 -if type timeout > /dev/null 2>&1 ; then
25 +if timeout -v 1s true > /dev/null 2>&1 ; then
26     TIMEOUT="timeout -v 30s"
27  else
28     TIMEOUT=
29 -- 
30 2.31.0
31