Commit 69fe8ec4 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

selftests: kselftest_harness: save full exit code in metadata 



Instead of tracking passed = 0/1 rename the field to exit_code
and invert the values so that they match the KSFT_* exit codes.
This will allow us to fold SKIP / XFAIL into the same value.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38c957f0

tools/testing/selftests/kselftest_harness.h

+27 −21
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ 
		fprintf(TH_LOG_STREAM, "#      SKIP      %s\n", \

			_metadata->results->reason); \

	} \

	_metadata->passed = 1; \

	_metadata->exit_code = KSFT_PASS; \

	_metadata->skip = 1; \

	_metadata->trigger = 0; \

	statement; \
@@ -387,7 +387,7 @@ 
		if (setjmp(_metadata->env) == 0) { \

			fixture_name##_setup(_metadata, &self, variant->data); \

			/* Let setup failure terminate early. */ \

			if (!_metadata->passed || _metadata->skip) \

			if (!__test_passed(_metadata) || _metadata->skip) \

				return; \

			_metadata->setup_completed = true; \

			/* Use the same _metadata. */ \
@@ -398,7 +398,7 @@ 
			} \

			if (child < 0) { \

				ksft_print_msg("ERROR SPAWNING TEST GRANDCHILD\n"); \

				_metadata->passed = 0; \

				_metadata->exit_code = KSFT_FAIL; \

			} \

		} \

		if (child == 0) \
@@ -747,7 +747,7 @@ 
			break; \

			} \

		} \

		_metadata->passed = 0; \

		_metadata->exit_code = KSFT_FAIL; \

		/* Ensure the optional handler is triggered */ \

		_metadata->trigger = 1; \

	} \
@@ -758,7 +758,7 @@ 
	const char *__seen = (_seen); \

	if (!(strcmp(__exp, __seen) _t 0))  { \

		__TH_LOG("Expected '%s' %s '%s'.", __exp, #_t, __seen); \

		_metadata->passed = 0; \

		_metadata->exit_code = KSFT_FAIL; \

		_metadata->trigger = 1; \

	} \

} while (0); OPTIONAL_HANDLER(_assert)
@@ -836,7 +836,7 @@ struct __test_metadata { 
	pid_t pid;	/* pid of test when being run */

	struct __fixture_metadata *fixture;

	int termsig;

	int passed;

	int exit_code;

	int skip;	/* did SKIP get used? */

	int trigger; /* extra handler after the evaluation */

	int timeout;	/* seconds to wait for test timeout */
@@ -848,6 +848,12 @@ struct __test_metadata { 
	struct __test_metadata *prev, *next;

};



static inline bool __test_passed(struct __test_metadata *metadata)

{

	return metadata->exit_code != KSFT_FAIL &&

	       metadata->exit_code <= KSFT_SKIP;

}



/*

 * Since constructors are called in reverse order, reverse the test

 * list so tests are run in source declaration order.
@@ -912,7 +918,7 @@ void __wait_for_test(struct __test_metadata *t) 
	int status;



	if (sigaction(SIGALRM, &action, &saved_action)) {

		t->passed = 0;

		t->exit_code = KSFT_FAIL;

		fprintf(TH_LOG_STREAM,

			"# %s: unable to install SIGALRM handler\n",

			t->name);
@@ -924,7 +930,7 @@ void __wait_for_test(struct __test_metadata *t) 
	waitpid(t->pid, &status, 0);

	alarm(0);

	if (sigaction(SIGALRM, &saved_action, NULL)) {

		t->passed = 0;

		t->exit_code = KSFT_FAIL;

		fprintf(TH_LOG_STREAM,

			"# %s: unable to uninstall SIGALRM handler\n",

			t->name);
@@ -933,16 +939,16 @@ void __wait_for_test(struct __test_metadata *t) 
	__active_test = NULL;



	if (t->timed_out) {

		t->passed = 0;

		t->exit_code = KSFT_FAIL;

		fprintf(TH_LOG_STREAM,

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

	} else if (WIFEXITED(status)) {

		if (WEXITSTATUS(status) == KSFT_SKIP) {

			/* SKIP */

			t->passed = 1;

			t->exit_code = KSFT_PASS;

			t->skip = 1;

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

			t->passed = 0;

			t->exit_code = KSFT_FAIL;

			fprintf(TH_LOG_STREAM,

				"# %s: Test exited normally instead of by signal (code: %d)\n",

				t->name,
@@ -951,24 +957,24 @@ void __wait_for_test(struct __test_metadata *t) 
			switch (WEXITSTATUS(status)) {

			/* Success */

			case KSFT_PASS:

				t->passed = 1;

				t->exit_code = KSFT_PASS;

				break;

			/* Failure */

			default:

				t->passed = 0;

				t->exit_code = KSFT_FAIL;

				fprintf(TH_LOG_STREAM,

					"# %s: Test failed\n",

					t->name);

			}

		}

	} else if (WIFSIGNALED(status)) {

		t->passed = 0;

		t->exit_code = KSFT_FAIL;

		if (WTERMSIG(status) == SIGABRT) {

			fprintf(TH_LOG_STREAM,

				"# %s: Test terminated by assertion\n",

				t->name);

		} else if (WTERMSIG(status) == t->termsig) {

			t->passed = 1;

			t->exit_code = KSFT_PASS;

		} else {

			fprintf(TH_LOG_STREAM,

				"# %s: Test terminated unexpectedly by signal %d\n",
@@ -1111,7 +1117,7 @@ void __run_test(struct __fixture_metadata *f, 
	char test_name[LINE_MAX];



	/* reset test struct */

	t->passed = 1;

	t->exit_code = KSFT_PASS;

	t->skip = 0;

	t->trigger = 0;

	memset(t->results->reason, 0, sizeof(t->results->reason));
@@ -1128,26 +1134,26 @@ void __run_test(struct __fixture_metadata *f, 
	t->pid = fork();

	if (t->pid < 0) {

		ksft_print_msg("ERROR SPAWNING TEST CHILD\n");

		t->passed = 0;

		t->exit_code = KSFT_FAIL;

	} else if (t->pid == 0) {

		setpgrp();

		t->fn(t, variant);

		if (t->skip)

			_exit(KSFT_SKIP);

		if (t->passed)

		if (__test_passed(t))

			_exit(KSFT_PASS);

		_exit(KSFT_FAIL);

	} else {

		__wait_for_test(t);

	}

	ksft_print_msg("         %4s  %s\n",

		       t->passed ? "OK" : "FAIL", test_name);

		       __test_passed(t) ? "OK" : "FAIL", test_name);



	if (t->skip)

		ksft_test_result_skip("%s\n", t->results->reason[0] ?

					t->results->reason : "unknown");

	else

		ksft_test_result(t->passed, "%s\n", test_name);

		ksft_test_result(__test_passed(t), "%s\n", test_name);

}



static int test_harness_run(int argc, char **argv)
@@ -1195,7 +1201,7 @@ static int test_harness_run(int argc, char **argv) 
				t->results = results;

				__run_test(f, v, t);

				t->results = NULL;

				if (t->passed)

				if (__test_passed(t))

					pass_count++;

				else

					ret = 1;

tools/testing/selftests/landlock/base_test.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ TEST(ruleset_fd_transfer) 
		dir_fd = open("/tmp", O_RDONLY | O_DIRECTORY | O_CLOEXEC);

		ASSERT_LE(0, dir_fd);

		ASSERT_EQ(0, close(dir_fd));

		_exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);

		_exit(_metadata->exit_code);

		return;

	}

tools/testing/selftests/landlock/fs_test.c

+2 −2
Original line number Diff line number Diff line
@@ -1964,7 +1964,7 @@ static void test_execute(struct __test_metadata *const _metadata, const int err, 
			       strerror(errno));

		};

		ASSERT_EQ(err, errno);

		_exit(_metadata->passed ? 2 : 1);

		_exit(__test_passed(_metadata) ? 2 : 1);

		return;

	}

	ASSERT_EQ(child, waitpid(child, &status, 0));
@@ -3807,7 +3807,7 @@ TEST_F_FORK(ftruncate, open_and_ftruncate_in_different_processes) 


		ASSERT_EQ(0, close(socket_fds[0]));



		_exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);

		_exit(_metadata->exit_code);

		return;

	}

tools/testing/selftests/landlock/net_test.c

+2 −2
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static void test_bind_and_connect(struct __test_metadata *const _metadata, 
		}



		EXPECT_EQ(0, close(connect_fd));

		_exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);

		_exit(_metadata->exit_code);

		return;

	}
@@ -834,7 +834,7 @@ TEST_F(protocol, connect_unspec) 
		}



		EXPECT_EQ(0, close(connect_fd));

		_exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);

		_exit(_metadata->exit_code);

		return;

	}

tools/testing/selftests/landlock/ptrace_test.c

+4 −3
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ TEST_F(hierarchy, trace) 
	ASSERT_EQ(0, pipe2(pipe_parent, O_CLOEXEC));

	if (variant->domain_both) {

		create_domain(_metadata);

		if (!_metadata->passed)

		if (!__test_passed(_metadata))

			/* Aborts before forking. */

			return;

	}
@@ -375,7 +375,7 @@ TEST_F(hierarchy, trace) 


		/* Waits for the parent PTRACE_ATTACH test. */

		ASSERT_EQ(1, read(pipe_parent[0], &buf_child, 1));

		_exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);

		_exit(_metadata->exit_code);

		return;

	}
@@ -430,9 +430,10 @@ TEST_F(hierarchy, trace) 
	/* Signals that the parent PTRACE_ATTACH test is done. */

	ASSERT_EQ(1, write(pipe_parent[1], ".", 1));

	ASSERT_EQ(child, waitpid(child, &status, 0));



	if (WIFSIGNALED(status) || !WIFEXITED(status) ||

	    WEXITSTATUS(status) != EXIT_SUCCESS)

		_metadata->passed = 0;

		_metadata->exit_code = KSFT_FAIL;

}



TEST_HARNESS_MAIN