Commit b3d46e11 authored by Kees Cook's avatar Kees Cook
Browse files

selftests/harness: Actually report SKIP for signal tests 



Tests that were expecting a signal were not correctly checking for a
SKIP condition. Move the check before the signal checking when
processing test result.

Cc: Shuah Khan <shuah@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Will Drewry <wad@chromium.org>
Cc: linux-kselftest@vger.kernel.org
Fixes: 9847d24a ("selftests/harness: Refactor XFAIL into SKIP")
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent fcce1c6c

tools/testing/selftests/kselftest_harness.h

+5 −6
Original line number Diff line number Diff line
@@ -938,7 +938,11 @@ void __wait_for_test(struct __test_metadata *t) 
		fprintf(TH_LOG_STREAM,

			"# %s: Test terminated by timeout\n", t->name);

	} else if (WIFEXITED(status)) {

		if (t->termsig != -1) {

		if (WEXITSTATUS(status) == 255) {

			/* SKIP */

			t->passed = 1;

			t->skip = 1;

		} else if (t->termsig != -1) {

			t->passed = 0;

			fprintf(TH_LOG_STREAM,

				"# %s: Test exited normally instead of by signal (code: %d)\n",
@@ -950,11 +954,6 @@ void __wait_for_test(struct __test_metadata *t) 
			case 0:

				t->passed = 1;

				break;

			/* SKIP */

			case 255:

				t->passed = 1;

				t->skip = 1;

				break;

			/* Other failure, assume step report. */

			default:

				t->passed = 0;