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

kselftest: run tests by fixture



Now that all tests have a fixture object move from a global
list of tests to a list of tests per fixture.

Order of tests may change as we will now group and run test
fixture by fixture, rather than in declaration order.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 142aca6b
Loading
Loading
Loading
Loading
+14 −9
Original line number Diff line number Diff line
@@ -659,9 +659,12 @@
	} \
}

struct __test_metadata;

/* Contains all the information about a fixture. */
struct __fixture_metadata {
	const char *name;
	struct __test_metadata *tests;
	struct __fixture_metadata *prev, *next;
} _fixture_global __attribute__((unused)) = {
	.name = "global",
@@ -698,7 +701,6 @@ struct __test_metadata {
};

/* Storage for the (global) tests to be run. */
static struct __test_metadata *__test_list;
static unsigned int __test_count;

/*
@@ -713,7 +715,7 @@ static unsigned int __test_count;
static inline void __register_test(struct __test_metadata *t)
{
	__test_count++;
	__LIST_APPEND(__test_list, t);
	__LIST_APPEND(t->fixture->tests, t);
}

static inline int __bail(int for_realz, bool no_print, __u8 step)
@@ -843,6 +845,7 @@ void __run_test(struct __fixture_metadata *f,
static int test_harness_run(int __attribute__((unused)) argc,
			    char __attribute__((unused)) **argv)
{
	struct __fixture_metadata *f;
	struct __test_metadata *t;
	int ret = 0;
	unsigned int count = 0;
@@ -851,14 +854,16 @@ static int test_harness_run(int __attribute__((unused)) argc,
	/* TODO(wad) add optional arguments similar to gtest. */
	printf("[==========] Running %u tests from %u test cases.\n",
	       __test_count, __fixture_count + 1);
	for (t = __test_list; t; t = t->next) {
	for (f = __fixture_list; f; f = f->next) {
		for (t = f->tests; t; t = t->next) {
			count++;
		__run_test(t->fixture, t);
			__run_test(f, t);
			if (t->passed)
				pass_count++;
			else
				ret = 1;
		}
	}
	printf("[==========] %u / %u tests passed.\n", pass_count, count);
	printf("[  %s  ]\n", (ret ? "FAILED" : "PASSED"));
	return ret;