diff options
Diffstat (limited to 'tests/tail-2')
-rwxr-xr-x | tests/tail-2/F-vs-rename | 2 | ||||
-rwxr-xr-x | tests/tail-2/big-4gb | 4 | ||||
-rwxr-xr-x | tests/tail-2/follow-stdin | 4 | ||||
-rwxr-xr-x | tests/tail-2/inotify-hash-abuse | 2 | ||||
-rwxr-xr-x | tests/tail-2/inotify-hash-abuse2 | 2 | ||||
-rwxr-xr-x | tests/tail-2/inotify-race | 4 | ||||
-rwxr-xr-x | tests/tail-2/pid | 2 | ||||
-rwxr-xr-x | tests/tail-2/pipe-f2 | 2 | ||||
-rwxr-xr-x | tests/tail-2/start-middle | 2 | ||||
-rwxr-xr-x | tests/tail-2/tail-n0f | 4 | ||||
-rwxr-xr-x | tests/tail-2/wait | 6 |
11 files changed, 17 insertions, 17 deletions
diff --git a/tests/tail-2/F-vs-rename b/tests/tail-2/F-vs-rename index b615ad3e6..5b4223e2b 100755 --- a/tests/tail-2/F-vs-rename +++ b/tests/tail-2/F-vs-rename @@ -21,7 +21,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ tail -touch a b || framework_failure +touch a b || framework_failure_ debug='---disable-inotify' debug= diff --git a/tests/tail-2/big-4gb b/tests/tail-2/big-4gb index 11faed5fb..874081168 100755 --- a/tests/tail-2/big-4gb +++ b/tests/tail-2/big-4gb @@ -25,8 +25,8 @@ expensive_ # at the beginning and another set of 8 bytes at the end. # The rest will be NUL bytes. On most modern systems, the following # creates a file that takes up only a few KB. Here, du -sh says 16K. -echo abcdefgh | tr -d '\n' > big || framework_failure -echo 87654321 | tr -d '\n' > tmp || framework_failure +echo abcdefgh | tr -d '\n' > big || framework_failure_ +echo 87654321 | tr -d '\n' > tmp || framework_failure_ # Seek 4GB - 8 dd bs=1 seek=4294967288 if=tmp of=big 2> err || dd_failed=1 if test "$dd_failed" = 1; then diff --git a/tests/tail-2/follow-stdin b/tests/tail-2/follow-stdin index e79f8f0a0..51520ab67 100755 --- a/tests/tail-2/follow-stdin +++ b/tests/tail-2/follow-stdin @@ -19,8 +19,8 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ tail -echo line > exp || framework_failure -echo line > in || framework_failure +echo line > exp || framework_failure_ +echo line > in || framework_failure_ timeout 1 tail -f < in > out 2> err diff --git a/tests/tail-2/inotify-hash-abuse b/tests/tail-2/inotify-hash-abuse index a01e57498..9415f9692 100755 --- a/tests/tail-2/inotify-hash-abuse +++ b/tests/tail-2/inotify-hash-abuse @@ -21,7 +21,7 @@ print_ver_ tail # 9 is a magic number, related to internal details of tail.c and hash.c n=9 -seq $n | xargs touch || framework_failure +seq $n | xargs touch || framework_failure_ debug='---disable-inotify' debug= diff --git a/tests/tail-2/inotify-hash-abuse2 b/tests/tail-2/inotify-hash-abuse2 index fc2b24b9c..424c2ebde 100755 --- a/tests/tail-2/inotify-hash-abuse2 +++ b/tests/tail-2/inotify-hash-abuse2 @@ -20,7 +20,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ tail -touch f || framework_failure +touch f || framework_failure_ debug='---disable-inotify -s .001' debug= diff --git a/tests/tail-2/inotify-race b/tests/tail-2/inotify-race index b88b8473c..6c4c02b65 100755 --- a/tests/tail-2/inotify-race +++ b/tests/tail-2/inotify-race @@ -28,8 +28,8 @@ print_ver_ tail # cleanup and exit correctly when it receives a SIGTERM, thus hanging the test. very_expensive_ -touch file || framework_failure -touch tail.out || framework_failure +touch file || framework_failure_ +touch tail.out || framework_failure_ ( timeout 10s gdb --version ) > gdb.out 2>&1 case $(cat gdb.out) in diff --git a/tests/tail-2/pid b/tests/tail-2/pid index f75c3deb2..31594e22f 100755 --- a/tests/tail-2/pid +++ b/tests/tail-2/pid @@ -20,7 +20,7 @@ print_ver_ tail getlimits_ -touch empty here || framework_failure +touch empty here || framework_failure_ for inotify in ---disable-inotify ''; do diff --git a/tests/tail-2/pipe-f2 b/tests/tail-2/pipe-f2 index 3422c23cf..f1ae47015 100755 --- a/tests/tail-2/pipe-f2 +++ b/tests/tail-2/pipe-f2 @@ -22,7 +22,7 @@ print_ver_ tail mkfifo_or_skip_ fifo echo 1 > fifo & -echo 1 > exp || framework_failure +echo 1 > exp || framework_failure_ timeout 10 tail -f fifo > out test $? = 124 || fail=1 diff --git a/tests/tail-2/start-middle b/tests/tail-2/start-middle index ab6ad5763..3dcbacbf9 100755 --- a/tests/tail-2/start-middle +++ b/tests/tail-2/start-middle @@ -20,7 +20,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ tail -(echo 1; echo 2) > k || framework_failure +(echo 1; echo 2) > k || framework_failure_ sh -c 'read x; tail' < k > out || fail=1 diff --git a/tests/tail-2/tail-n0f b/tests/tail-2/tail-n0f index d17a6c238..1720a6eca 100755 --- a/tests/tail-2/tail-n0f +++ b/tests/tail-2/tail-n0f @@ -26,8 +26,8 @@ print_ver_ tail require_proc_pid_status_ -touch empty || framework_failure -echo anything > nonempty || framework_failure +touch empty || framework_failure_ +echo anything > nonempty || framework_failure_ for inotify in ---disable-inotify ''; do diff --git a/tests/tail-2/wait b/tests/tail-2/wait index 8fd19948c..a1119703e 100755 --- a/tests/tail-2/wait +++ b/tests/tail-2/wait @@ -20,8 +20,8 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ tail -touch here || framework_failure -{ touch unreadable && chmod a-r unreadable; } || framework_failure +touch here || framework_failure_ +{ touch unreadable && chmod a-r unreadable; } || framework_failure_ for inotify in ---disable-inotify ''; do @@ -58,7 +58,7 @@ for inotify in ---disable-inotify ''; do { local delay="$1" - touch k || framework_failure + touch k || framework_failure_ tail -s.1 --max-unchanged-stats=2 -F $inotify k > tail.out & pid=$! sleep $delay |