diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-24 15:21:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-24 15:21:05 -0700 |
| commit | 7f8b40e3dbcd7dbeabe6be8f157376ef0b890e06 (patch) | |
| tree | c86f25d4a081b07727d21d229b4e8fdcfb798d22 /tools/testing/selftests/kselftest/runner.sh | |
| parent | e7bd3e248bc36451fdbf2a2e3a3c5a23cd0b1f6f (diff) | |
| parent | fe48319243a626c860fd666ca032daacc2ba84a5 (diff) | |
| download | linux-7f8b40e3dbcd7dbeabe6be8f157376ef0b890e06.tar.gz linux-7f8b40e3dbcd7dbeabe6be8f157376ef0b890e06.tar.bz2 linux-7f8b40e3dbcd7dbeabe6be8f157376ef0b890e06.zip | |
Merge tag 'linux-kselftest-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull Kselftest fixes from Shuah Khan:
- Two fixes to regressions introduced in kselftest Makefile test run
output refactoring work (Kees Cook)
- Adding Atom support to syscall_arg_fault test (Tong Bo)
* tag 'linux-kselftest-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests/timers: Add missing fflush(stdout) calls
selftests: Remove forced unbuffering for test running
selftests/x86: Support Atom for syscall_arg_fault test
Diffstat (limited to 'tools/testing/selftests/kselftest/runner.sh')
| -rw-r--r-- | tools/testing/selftests/kselftest/runner.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/tools/testing/selftests/kselftest/runner.sh b/tools/testing/selftests/kselftest/runner.sh index eff3ee303d0d..00c9020bdda8 100644 --- a/tools/testing/selftests/kselftest/runner.sh +++ b/tools/testing/selftests/kselftest/runner.sh @@ -24,16 +24,6 @@ tap_prefix() fi } -# If stdbuf is unavailable, we must fall back to line-at-a-time piping. -tap_unbuffer() -{ - if ! which stdbuf >/dev/null ; then - "$@" - else - stdbuf -i0 -o0 -e0 "$@" - fi -} - run_one() { DIR="$1" @@ -54,7 +44,7 @@ run_one() echo "not ok $test_num $TEST_HDR_MSG" else cd `dirname $TEST` > /dev/null - (((((tap_unbuffer ./$BASENAME_TEST 2>&1; echo $? >&3) | + (((((./$BASENAME_TEST 2>&1; echo $? >&3) | tap_prefix >&4) 3>&1) | (read xs; exit $xs)) 4>>"$logfile" && echo "ok $test_num $TEST_HDR_MSG") || |