On 6/9/22 2:24 PM, Jakub Kicinski wrote:
As the number of test cases and length of execution grows it's
useful to select only a subset of tests. In TLS for instance we
have a matrix of variants for different crypto protocols and
during development mostly care about testing a handful.
This is quicker and makes reading output easier.
This patch adds argument parsing to kselftest_harness.
It supports a couple of ways to filter things, I could not come
up with one way which will cover all cases.
The first and simplest switch is -r which takes the name of
a test to run (can be specified multiple times).
Then there is a handful of group filtering options. f/v/t for
filtering by fixture/variant/test. They have both positive
(match -> run) and negative versions (match -> skip).
If user specifies any positive option we assume the default
is not to run the tests. If only negative options are set
we assume the tests are supposed to be run by default.
Usage: ./tools/testing/selftests/net/tls [-h|-l] [-t|-T|-v|-V|-f|-F|-r name]
-h print help
-l list all tests
-t name include test
-T name exclude test
-v name include variant
-V name exclude variant
-f name include fixture
-F name exclude fixture
-r name run specified test
Test filter options can be specified multiple times. The filtering stops
at the first match. For example to include all tests from variant 'bla'
but not test 'foo' specify '-T foo -v bla'.
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
---
CC: keescook@xxxxxxxxxxxx
CC: luto@xxxxxxxxxxxxxx
CC: wad@xxxxxxxxxxxx
CC: shuah@xxxxxxxxxx
CC: linux-kselftest@xxxxxxxxxxxxxxx
---
tools/testing/selftests/kselftest_harness.h | 146 +++++++++++++++++++-
1 file changed, 142 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
index 25f4d54067c0..bcbad9fa0039 100644
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -54,6 +54,7 @@
#define _GNU_SOURCE
#endif
#include <asm/types.h>
+#include <ctype.h>
#include <errno.h>
#include <stdbool.h>
#include <stdint.h>
@@ -985,6 +986,132 @@ void __wait_for_test(struct __test_metadata *t)
}
}
+static int test_harness_argv_check(int argc, char **argv)
+{
+ const char *opts = "FfVvtTr";
+ unsigned int i;
+
+ for (i = 0; i < argc; i++) {
+ if (!strcmp(argv[i], "-l")) {
+ struct __fixture_variant_metadata *v;
+ struct __fixture_metadata *f;
+ struct __test_metadata *t;
+
+ for (f = __fixture_list; f; f = f->next) {
+ v = f->variant;
+ t = f->tests;
+
+ if (f == __fixture_list)
+ fprintf(stderr, "%-20s %-25s %s\n",
+ "# FIXTURE", "VARIANT", "TEST");
+ else
+ fprintf(stderr, "--------------------------------------------------------------------------------\n");
+
+ do {
+ fprintf(stderr, "%-20s %-25s %s\n",
+ t == f->tests ? f->name : "",
+ v ? v->name : "",
+ t ? t->name : "");
+
+ v = v ? v->next : NULL;
+ t = t ? t->next : NULL;
+ } while (v || t);
+ }
+ return 1;
+ }
Change this to use getopt() to simplify argument parsing and make
it easier to maintain.
+ if (!strcmp(argv[i], "-h")) {
+help_and_fail:
+ argv--;
+ fprintf(stderr,
+ "Usage: %s [-h|-l] [-t|-T|-v|-V|-f|-F|-r name]\n"
+ "\t-h print help\n"
+ "\t-l list all tests\n"
+ "\n"
+ "\t-t name include test\n"
+ "\t-T name exclude test\n"
+ "\t-v name include variant\n"
+ "\t-V name exclude variant\n"
+ "\t-f name include fixture\n"
+ "\t-F name exclude fixture\n"
+ "\t-r name run specified test\n"
+ "\n"
+ "Test filter options can be specified "
+ "multiple times. The filtering stops\n"
+ "at the first match. For example to "
+ "include all tests from variant 'bla'\n"
+ "but not test 'foo' specify '-T foo -v bla'.\n"
+ "", argv[0]);
+ return -1;
+ }
+ }
+
+ if (argc % 2) {
+ ksft_print_msg("FATAL: Odd number of arguments\n");
+ goto help_and_fail;
+ }
+
+ for (i = 0; i < argc; i += 2) {
+ if (strnlen(argv[i], 3) != 2 || argv[i][0] != '-') {
+ ksft_print_msg("FATAL: invalid option '%s'\n", argv[i]);
+ goto help_and_fail;
+ }
+
+ if (!strchr(opts, argv[i][1])) {
+ ksft_print_msg("FATAL: unknown option '%s'\n", argv[i]);
+ goto help_and_fail;
+ }
+ }
+
+ return 1;
+}
+
+static bool test_enabled(int argc, char **argv,
+ struct __fixture_metadata *f,
+ struct __fixture_variant_metadata *v,
+ struct __test_metadata *t)
+{
+ unsigned int flen, vlen, tlen = 0;
+ bool has_positive = false;
+ unsigned int i;
+
+ for (i = 0; i < argc; i += 2) {
+ has_positive |= islower(argv[i][1]);
+
+ switch (tolower(argv[i][1])) {
+ case 't':
+ if (!strcmp(t->name, argv[i + 1]))
+ return islower(argv[i][1]);
+ break;
+ case 'f':
+ if (!strcmp(f->name, argv[i + 1]))
+ return islower(argv[i][1]);
+ break;
+ case 'v':
+ if (!strcmp(v->name, argv[i + 1]))
+ return islower(argv[i][1]);
+ break;
+ case 'r':
+ if (!tlen) {
+ flen = strlen(f->name);
+ vlen = strlen(v->name);
+ tlen = strlen(t->name);
+ }
+ if (strlen(argv[i + 1]) == flen + 1 + vlen + !!vlen + tlen &&
+ !strncmp(f->name, &argv[i + 1][0], flen) &&
+ !strncmp(v->name, &argv[i + 1][flen + 1], vlen) &&
+ !strncmp(t->name, &argv[i + 1][flen + 1 + vlen + !!vlen], tlen))
+ return true;
+ break;
+ }
Same here. Use getopt()
+ }
+
+ /*
+ * If there are no positive tests then we assume user just wants
+ * exclusions and everything else is a pass.
+ */
+ return !has_positive;
+}
+
void __run_test(struct __fixture_metadata *f,
struct __fixture_variant_metadata *variant,
struct __test_metadata *t)
@@ -1032,8 +1159,7 @@ void __run_test(struct __fixture_metadata *f,
f->name, variant->name[0] ? "." : "", variant->name, t->name);
}
-static int test_harness_run(int __attribute__((unused)) argc,
- char __attribute__((unused)) **argv)
+static int test_harness_run(int argc, char **argv)
{
struct __fixture_variant_metadata no_variant = { .name = "", };
struct __fixture_variant_metadata *v;
@@ -1045,11 +1171,21 @@ static int test_harness_run(int __attribute__((unused)) argc,
unsigned int count = 0;
unsigned int pass_count = 0;
+ argc--; argv++; /* Skip the name of the binary */
+ ret = test_harness_argv_check(argc, argv);
+ if (ret < 0)
+ return KSFT_FAIL;
+
for (f = __fixture_list; f; f = f->next) {
for (v = f->variant ?: &no_variant; v; v = v->next) {
- case_count++;
+ unsigned int old_tests = test_count;
+
for (t = f->tests; t; t = t->next)
- test_count++;
+ if (test_enabled(argc, argv, f, v, t))
+ test_count++;
+
+ if (old_tests != test_count)
+ case_count++;
}
}
@@ -1063,6 +1199,8 @@ static int test_harness_run(int __attribute__((unused)) argc,
for (f = __fixture_list; f; f = f->next) {
for (v = f->variant ?: &no_variant; v; v = v->next) {
for (t = f->tests; t; t = t->next) {
+ if (!test_enabled(argc, argv, f, v, t))
+ continue;
count++;
t->results = results;
__run_test(f, v, t);
thanks,
-- Shuah
