testsuite: Add facility to skip tests.
PATCH 1/1 testsuite: Add facility to skip tests.
The Makefile helpfully warns that some tests will fail when --sysconfdir != /etc, but there are no provisions to easily disable those. This commit provides an escape hatch.
--- testsuite/testsuite.c | 9 +++++++++ testsuite/testsuite.h | 1 + 2 files changed, 10 insertions(+)
testsuite/testsuite.c +9 -0
@@ -37,6 +37,7 @@#include "testsuite.h" static const char *ANSI_HIGHLIGHT_GREEN_ON ="\x1B[1;32m" ; +static const char *ANSI_HIGHLIGHT_YELLOW_ON ="\x1B[1;33m" ;static const char *ANSI_HIGHLIGHT_RED_ON ="\x1B[1;31m" ;static const char *ANSI_HIGHLIGHT_OFF ="\x1B[0m" ;
@@ -948,6 +949,14 @@ static inline int test_run_parent(const struct test *t, int fdout[2],int err;bool matchout, match_modules; +if (t->skip == true) { +LOG ("%sSKIPPED%s: %s\n" , +ANSI_HIGHLIGHT_YELLOW_ON ,ANSI_HIGHLIGHT_OFF , + t->name); + err =EXIT_SUCCESS ; + goto exit; + } +/* Close write-fds */ if (t->output.out !=NULL )close (fdout[1 ]);
testsuite/testsuite.h +1 -0
@@ -109,6 +109,7 @@ struct test {const struct keyval *env_vars;bool need_spawn;bool expected_fail; +bool skip;bool print_outputs; } __attribute__((aligned(8)));
Signature · 1 line
2.26.2
Quoted 4 lines · Marius Bakke
The
Makefilehelpfully warns that some tests will fail when --sysconfdir != /etc, but there are no provisions to easily disable those. This commit provides an escape hatch.
nice... but are we missing a patch to actually make it skip?
Quoted 18 lines
--- testsuite/testsuite.c | 9 +++++++++ testsuite/testsuite.h | 1 + 2 files changed, 10 insertions(+)testsuite/testsuite.c +1
-0@@ -37,6 +37,7 @@#include "testsuite.h" static const char *ANSI_HIGHLIGHT_GREEN_ON ="\x1B[1;32m" ; +static const char *ANSI_HIGHLIGHT_YELLOW_ON ="\x1B[1;33m" ;static const char *ANSI_HIGHLIGHT_RED_ON ="\x1B[1;31m" ;static const char *ANSI_HIGHLIGHT_OFF ="\x1B[0m" ;
testsuite/testsuite.c static inline int test_run_parent(const struct test *t, int fdout[2], · line 952
Quoted 4 lines
testsuite/testsuite.c +1
-0@@ -948,6 +949,14 @@ static inline int test_run_parent(const struct test *t, int fdout[2],int err;bool matchout, match_modules; +if (t->skip == true) {
only if (t->skip) would be less verbose and preferred I think.
thanks
Lucas de Marchi
Quoted 25 lines
testsuite/testsuite.c +7
-0+LOG ("%sSKIPPED%s: %s\n" , +ANSI_HIGHLIGHT_YELLOW_ON ,ANSI_HIGHLIGHT_OFF , + t->name); + err =EXIT_SUCCESS ; + goto exit; + } +/* Close write-fds */ if (t->output.out !=NULL )close (fdout[1 ]);testsuite/testsuite.h +1
-1@@ -109,6 +109,7 @@ struct test {const struct keyval *env_vars;bool need_spawn;bool expected_fail; +bool skip;bool print_outputs; } __attribute__((aligned(8))); --2.26.2
Signature · 1 line
Lucas De Marchi
Quoted 7 lines · Lucas De Marchi
Quoted 4 lines · Marius Bakke
The
Makefilehelpfully warns that some tests will fail when --sysconfdir != /etc, but there are no provisions to easily disable those. This commit provides an escape hatch.nice... but are we missing a patch to actually make it skip?
Uh... That makes sense. (I maintained a list down-stream, derp.)
Quoted 7 lines
testsuite/testsuite.c static inline int test_run_parent(const struct test *t, int fdout[2], · line 952
Quoted 5 lines
testsuite/testsuite.c +1
-0@@ -948,6 +949,14 @@ static inline int test_run_parent(const struct test *t, int fdout[2],int err;bool matchout, match_modules; +if (t->skip == true) {only if (
t->skip) would be less verbose and preferred I think.
Fixed in v2, thanks!
Marius Bakke (2):
testsuite: Add facility to skip tests.
testsuite: Automatically skip tests that fail when sysconfdir != /etc.
Makefile.am | 12 +++++------- configure.ac | 2 ++ testsuite/test-blacklist.c | 3 +++ testsuite/test-depmod.c | 12 ++++++++++++ testsuite/test-modprobe.c | 6 ++++++ testsuite/testsuite.c | 9 +++++++++ testsuite/testsuite.h | 1 + 7 files changed, 38 insertions(+), 7 deletions(-)
PATCH v2 1/2 testsuite: Add facility to skip tests.
The Makefile helpfully warns that some tests will fail when --sysconfdir != /etc, but there are no provisions to easily disable those. This commit provides an escape hatch.
--- testsuite/testsuite.c | 9 +++++++++ testsuite/testsuite.h | 1 + 2 files changed, 10 insertions(+)
testsuite/testsuite.c +9 -0
@@ -37,6 +37,7 @@#include "testsuite.h" static const char *ANSI_HIGHLIGHT_GREEN_ON ="\x1B[1;32m" ; +static const char *ANSI_HIGHLIGHT_YELLOW_ON ="\x1B[1;33m" ;static const char *ANSI_HIGHLIGHT_RED_ON ="\x1B[1;31m" ;static const char *ANSI_HIGHLIGHT_OFF ="\x1B[0m" ;
@@ -948,6 +949,14 @@ static inline int test_run_parent(const struct test *t, int fdout[2],int err;bool matchout, match_modules; +if (t->skip) { +LOG ("%sSKIPPED%s: %s\n" , +ANSI_HIGHLIGHT_YELLOW_ON ,ANSI_HIGHLIGHT_OFF , + t->name); + err =EXIT_SUCCESS ; + goto exit; + } +/* Close write-fds */ if (t->output.out !=NULL )close (fdout[1 ]);
testsuite/testsuite.h +1 -0
@@ -109,6 +109,7 @@ struct test {const struct keyval *env_vars;bool need_spawn;bool expected_fail; +bool skip;bool print_outputs; } __attribute__((aligned(8)));
Signature · 1 line
2.28.0
PATCH v2 2/2 testsuite: Automatically skip tests that fail when sysconfdir != /etc.
In reply to Marius Bakke--- Makefile.am | 12 +++++------- configure.ac | 2 ++ testsuite/test-blacklist.c | 3 +++ testsuite/test-depmod.c | 12 ++++++++++++ testsuite/test-modprobe.c | 6 ++++++ 5 files changed, 28 insertions(+), 7 deletions(-)
Makefile.am +5 -7
@@ -265,13 +265,7 @@ TESTSUITE_OVERRIDE_LIBS = \ TESTSUITE_OVERRIDE_LIBS_LDFLAGS = \ avoid-version -module -shared -export-dynamic -rpath /nowhere -ldl -check-sysconfdir: - $(AM_V_at)if test "$(sysconfdir)" != "/etc" -a "$(sysconfdir)" != "/etc/"; then \ - echo "warning: Some tests will fail without --sysconfdir=/etc" >&2; \ - fi -.PHONY: check-sysconfdir - -check-am: rootfs check-sysconfdir +check-am: rootfs EXTRA_DIST += \
@@ -326,6 +320,10 @@ TESTSUITE_LDADD = \ testsuite/libtestsuite.la libkmod/libkmod-internal.la \ shared/libshared.la +if KMOD_SYSCONFDIR_NOT_ETC +TESTSUITE_CPPFLAGS += -DKMOD_SYSCONFDIR_NOT_ETC +endif + check_LTLIBRARIES += testsuite/libtestsuite.la testsuite_libtestsuite_la_SOURCES = \ testsuite/testsuite.c testsuite/testsuite.h
configure.ac +2 -0
@@ -213,6 +213,8 @@ GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat]) ], [ AM_CONDITIONAL([ENABLE_GTK_DOC], false)]) +# Some tests are skipped when sysconfdir != /etc. +AM_CONDITIONAL([KMOD_SYSCONFDIR_NOT_ETC], [test "x$sysconfdir" != "x/etc"]) ##################################################################### # Default CFLAGS and LDFLAGS
testsuite/test-blacklist.c +3 -0
@@ -95,6 +95,9 @@ fail_lookup: }DEFINE_TEST (blacklist_1, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if modules are correctly blacklisted", .config = { [TC_ROOTFS] = TESTSUITE_ROOTFS "test-blacklist/",
testsuite/test-depmod.c +12 -0
@@ -42,6 +42,9 @@ static noreturn int depmod_modules_order_for_compressed(const struct test *t) }DEFINE_TEST (depmod_modules_order_for_compressed, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if depmod let aliases in right order when using compressed modules", .config = { [TC_UNAME_R] = MODULES_ORDER_UNAME,
@@ -121,6 +124,9 @@ static noreturn int depmod_detect_loop(const struct test *t)exit (EXIT_FAILURE ); }DEFINE_TEST (depmod_detect_loop, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if depmod detects module loops correctly", .config = { [TC_UNAME_R] = "4.4.4",
@@ -144,6 +150,9 @@ static noreturn int depmod_search_order_external_first(const struct test *t)exit (EXIT_FAILURE ); }DEFINE_TEST (depmod_search_order_external_first, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if depmod honor external keyword with higher priority", .config = { [TC_UNAME_R] = "4.4.4",
@@ -196,6 +205,9 @@ static noreturn int depmod_search_order_override(const struct test *t)exit (EXIT_FAILURE ); }DEFINE_TEST (depmod_search_order_override, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if depmod honor override keyword", .config = { [TC_UNAME_R] = "4.4.4",
testsuite/test-modprobe.c +6 -0
@@ -83,6 +83,9 @@ static noreturn int modprobe_show_alias_to_none(const struct test *t)exit (EXIT_FAILURE ); }DEFINE_TEST (modprobe_show_alias_to_none, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if modprobe --show-depends doesn't explode with an alias to nothing", .config = { [TC_UNAME_R] = "4.4.4",
@@ -172,6 +175,9 @@ static noreturn int modprobe_softdep_loop(const struct test *t)exit (EXIT_FAILURE ); }DEFINE_TEST (modprobe_softdep_loop, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if modprobe breaks softdep loop", .config = { [TC_UNAME_R] = "4.4.4",
Signature · 1 line
2.28.0
Sorry for the delay. This is now applied.
Lucas De Marchi
Quoted 51 lines · Marius Bakke
The
Makefilehelpfully warns that some tests will fail when --sysconfdir != /etc, but there are no provisions to easily disable those. This commit provides an escape hatch.--- testsuite/testsuite.c | 9 +++++++++ testsuite/testsuite.h | 1 + 2 files changed, 10 insertions(+)testsuite/testsuite.c +9
-0@@ -37,6 +37,7 @@#include "testsuite.h" static const char *ANSI_HIGHLIGHT_GREEN_ON ="\x1B[1;32m" ; +static const char *ANSI_HIGHLIGHT_YELLOW_ON ="\x1B[1;33m" ;static const char *ANSI_HIGHLIGHT_RED_ON ="\x1B[1;31m" ;static const char *ANSI_HIGHLIGHT_OFF ="\x1B[0m" ;@@ -948,6 +949,14 @@ static inline int test_run_parent(const struct test *t, int fdout[2],int err;bool matchout, match_modules; +if (t->skip) { +LOG ("%sSKIPPED%s: %s\n" , +ANSI_HIGHLIGHT_YELLOW_ON ,ANSI_HIGHLIGHT_OFF , + t->name); + err =EXIT_SUCCESS ; + goto exit; + } +/* Close write-fds */ if (t->output.out !=NULL )close (fdout[1 ]);testsuite/testsuite.h +1
-1@@ -109,6 +109,7 @@ struct test {const struct keyval *env_vars;bool need_spawn;bool expected_fail; +bool skip;bool print_outputs; } __attribute__((aligned(8))); --2.28.0