Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f8b40e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-5.2-rc2' of... 

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
parents e7bd3e24 fe483192

tools/testing/selftests/kselftest/runner.sh

+1 −11
Original line number Diff line number Diff line
@@ -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") ||

tools/testing/selftests/timers/adjtick.c

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ int check_tick_adj(long tickval) 


	eppm = get_ppm_drift();

	printf("%lld usec, %lld ppm", systick + (systick * eppm / MILLION), eppm);

	fflush(stdout);



	tx1.modes = 0;

	adjtimex(&tx1);

tools/testing/selftests/timers/leapcrash.c

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ int main(void) 
		}

		clear_time_state();

		printf(".");

		fflush(stdout);

	}

	printf("[OK]\n");

	return ksft_exit_pass();

tools/testing/selftests/timers/mqueue-lat.c

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ int main(int argc, char **argv) 
	int ret;



	printf("Mqueue latency :                          ");

	fflush(stdout);



	ret = mqueue_lat_test();

	if (ret < 0) {

tools/testing/selftests/timers/nanosleep.c

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ int main(int argc, char **argv) 
			continue;



		printf("Nanosleep %-31s ", clockstring(clockid));

		fflush(stdout);



		length = 10;

		while (length <= (NSEC_PER_SEC * 10)) {