testsuite: remove now unused array of tests

Remove the arrays and let each test with a guaranteed unique name.

diff --git a/shared/macro.h b/shared/macro.h
index 0f8e4c0d3258f624ab8fb434fad4aa196e8f9c7a..0f035b1781886245e335d2c59c0ab328dca27edb 100644 (file)
--- a/shared/macro.h
+++ b/shared/macro.h
@@ -68,3 +68,5 @@
 #define noreturn __attribute__((noreturn))
 #endif
 #endif
+
+#define UNIQ __COUNTER__

diff --git a/testsuite/test-array.c b/testsuite/test-array.c
index 3f095d5e14d30d472349ae13204f4ed563615cf6..35b49b5e039b9f77caddc2a0786b150df63c6068 100644 (file)
--- a/testsuite/test-array.c
+++ b/testsuite/test-array.c
@@ -160,13 +160,4 @@ static int test_array_remove_at(const struct test *t)
 DEFINE_TEST(test_array_remove_at,
                .description = "test array remove at");
 
-static const struct test *tests[] = {
-       &stest_array_append1,
-       &stest_array_append2,
-       &stest_array_append_unique,
-       &stest_array_sort,
-       &stest_array_remove_at,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();

diff --git a/testsuite/test-blacklist.c b/testsuite/test-blacklist.c
index 0937391ea1b9fbcf0adfe9356b136e6a2df13148..7202bf854ff1fe774500d097be7a6ff1103a1c6c 100644 (file)
--- a/testsuite/test-blacklist.c
+++ b/testsuite/test-blacklist.c
@@ -102,9 +102,4 @@ static const struct test sblacklist_1 = {
        .need_spawn = true,
 };
 
-static const struct test *tests[] = {
-       &sblacklist_1,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();

diff --git a/testsuite/test-dependencies.c b/testsuite/test-dependencies.c
index 98e8f76c3cdfad739ac1b1b3e7371324ddf321f4..6860a98d2692488751efe94f735f5f9e042294ea 100644 (file)
--- a/testsuite/test-dependencies.c
+++ b/testsuite/test-dependencies.c
@@ -87,9 +87,4 @@ static const struct test stest_dependencies = {
        .need_spawn = true,
 };
 
-static const struct test *tests[] = {
-       &stest_dependencies,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();

diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c
index 480a3efe0d9a7eb798b64fe6ade95f4f2a74a66c..05284b415d1a72aa1ff4fe20fda591c53cb01d60 100644 (file)
--- a/testsuite/test-depmod.c
+++ b/testsuite/test-depmod.c
@@ -40,6 +40,8 @@ static noreturn int depmod_modules_order_for_compressed(const struct test *t)
        test_spawn_prog(progname, args);
        exit(EXIT_FAILURE);
 }
+
+#ifdef ENABLE_ZLIB
 DEFINE_TEST(depmod_modules_order_for_compressed,
        .description = "check if depmod let aliases in right order when using compressed modules",
        .config = {
@@ -53,6 +55,7 @@ DEFINE_TEST(depmod_modules_order_for_compressed,
                        { }
                },
        });
+#endif
 
 #define SEARCH_ORDER_SIMPLE_ROOTFS TESTSUITE_ROOTFS "test-depmod/search-order-simple"
 static noreturn int depmod_search_order_simple(const struct test *t)
@@ -129,15 +132,4 @@ DEFINE_TEST(depmod_detect_loop,
                .err = DETECT_LOOP_ROOTFS "/correct.txt",
        });
 
-
-static const struct test *tests[] = {
-#ifdef ENABLE_ZLIB
-       &sdepmod_modules_order_for_compressed,
-#endif
-       &sdepmod_search_order_simple,
-       &sdepmod_search_order_same_prefix,
-       &sdepmod_detect_loop,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();

diff --git a/testsuite/test-hash.c b/testsuite/test-hash.c
index 70b41262b392bfd6c3e7d156074fbc69bb29fde6..b3fb9a0fd9eff1133e54c032ab2e358e361c4f7a 100644 (file)
--- a/testsuite/test-hash.c
+++ b/testsuite/test-hash.c
@@ -219,16 +219,5 @@ static int test_hash_free(const struct test *t)
 }
 DEFINE_TEST(test_hash_free,
                .description = "test hash_free calling free function for all values");
-static const struct test *tests[] = {
-       &stest_hash_new,
-       &stest_hash_get_count,
-       &stest_hash_replace,
-       &stest_hash_replace_failing,
-       &stest_hash_iter,
-       &stest_hash_iter_after_del,
-       &stest_hash_free,
-       NULL,
-};
-
-
-TESTSUITE_MAIN(tests);
+
+TESTSUITE_MAIN();

diff --git a/testsuite/test-init.c b/testsuite/test-init.c
index 8b2419cf8f6e7264f381ae4e3de1b478f5dec18f..7c47d3ac90c1df2aff78d096fdf09da4258bb112 100644 (file)
--- a/testsuite/test-init.c
+++ b/testsuite/test-init.c
@@ -113,11 +113,4 @@ DEFINE_TEST(test_remove,
        },
        .need_spawn = true);
 
-static const struct test *tests[] = {
-       &stest_initlib,
-       &stest_insert,
-       &stest_remove,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();

diff --git a/testsuite/test-loaded.c b/testsuite/test-loaded.c
index bb5f6ad5304fa7b6acbe95a89d800e8e3507cd29..355171f9b44d080304d4821a4b2912aea89327d8 100644 (file)
--- a/testsuite/test-loaded.c
+++ b/testsuite/test-loaded.c
@@ -89,9 +89,4 @@ DEFINE_TEST(loaded_1,
                .out = TESTSUITE_ROOTFS "test-loaded/correct.txt",
        });
 
-static const struct test *tests[] = {
-       &sloaded_1,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();

diff --git a/testsuite/test-modinfo.c b/testsuite/test-modinfo.c
index c5b44a091445852648493b2d8d677f4f8314384d..76506bed1017e549ea34648b136f6ad06dd4b3f1 100644 (file)
--- a/testsuite/test-modinfo.c
+++ b/testsuite/test-modinfo.c
@@ -49,9 +49,4 @@ DEFINE_TEST(modinfo_jonsmodules,
                .out = TESTSUITE_ROOTFS "test-modinfo/correct.txt",
        });
 
-static const struct test *tests[] = {
-       &smodinfo_jonsmodules,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();

diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index 1d874cbde83a2cf8573a9404904087cf0c970b6c..792325771d367a0b95eec45d308bf85b7ea64118 100644 (file)
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -325,22 +325,4 @@ DEFINE_TEST(modprobe_oldkernel_force,
        .modules_loaded = "psmouse",
        );
 
-
-static const struct test *tests[] = {
-       &smodprobe_show_depends,
-       &smodprobe_show_depends2,
-       &smodprobe_show_alias_to_none,
-       &smodprobe_builtin,
-       &smodprobe_softdep_loop,
-       &smodprobe_install_cmd_loop,
-       &smodprobe_param_kcmdline,
-       &smodprobe_param_kcmdline2,
-       &smodprobe_param_kcmdline3,
-       &smodprobe_param_kcmdline4,
-       &smodprobe_force,
-       &smodprobe_oldkernel,
-       &smodprobe_oldkernel_force,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();

diff --git a/testsuite/test-new-module.c b/testsuite/test-new-module.c
index 8b057d119a42fa660ad772a6413ebab4fafc13dc..2f49a110253bffb527c0c95c01427ca38aca7762 100644 (file)
--- a/testsuite/test-new-module.c
+++ b/testsuite/test-new-module.c
@@ -116,10 +116,4 @@ DEFINE_TEST(from_alias,
                .out = TESTSUITE_ROOTFS "test-new-module/from_alias/correct.txt",
        });
 
-static const struct test *tests[] = {
-       &sfrom_name,
-       &sfrom_alias,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();

diff --git a/testsuite/test-testsuite.c b/testsuite/test-testsuite.c
index e2b94464e914ce03b9d62a64524fa47fcf39e9ce..f324cc9490419e9d1c05b0d4a5dace4f39a4e92a 100644 (file)
--- a/testsuite/test-testsuite.c
+++ b/testsuite/test-testsuite.c
@@ -159,13 +159,4 @@ DEFINE_TEST(testsuite_rootfs_opendir,
        },
        .need_spawn = true);
 
-static const struct test *tests[] = {
-       &stestsuite_uname,
-       &stestsuite_rootfs_fopen,
-       &stestsuite_rootfs_open,
-       &stestsuite_rootfs_stat_access,
-       &stestsuite_rootfs_opendir,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();

diff --git a/testsuite/test-util.c b/testsuite/test-util.c
index 5e4fb0e99f9520c9be6880a17060756febdc1d46..9ffcf56e30b674c2b725850cd75f96393f498cd0 100644 (file)
--- a/testsuite/test-util.c
+++ b/testsuite/test-util.c
@@ -97,10 +97,4 @@ DEFINE_TEST(test_freadline_wrapped,
                .out = TESTSUITE_ROOTFS "test-util/freadline_wrapped-correct.txt",
        });
 
-static const struct test *tests[] = {
-       &salias_1,
-       &stest_freadline_wrapped,
-       NULL,
-};
-
-TESTSUITE_MAIN(tests);
+TESTSUITE_MAIN();

diff --git a/testsuite/testsuite.h b/testsuite/testsuite.h
index f9a6e91550fc42598ef7e022e5400ec48a79da21..8688ed0ca990091683946bc20e956020c6c7c7c7 100644 (file)
--- a/testsuite/testsuite.h
+++ b/testsuite/testsuite.h
@@ -132,14 +132,14 @@ int test_run(const struct test *t);
 
 /* Test definitions */
 #define DEFINE_TEST(_name, ...) \
-       static const struct test s##_name \
+       static const struct test s##_name##UNIQ \
        __attribute__((used, section("kmod_tests"), aligned(8))) = { \
                .name = #_name, \
                .func = _name, \
                ## __VA_ARGS__ \
        };
 
-#define TESTSUITE_MAIN(_tests) \
+#define TESTSUITE_MAIN() \
        extern struct test __start_kmod_tests[] __attribute__((weak, visibility("hidden")));    \
        extern struct test __stop_kmod_tests[] __attribute__((weak, visibility("hidden")));     \
        int main(int argc, char *argv[])                                                        \