testsuite: fold test-dependencies into test-libkmod

Arguably improves things by providing some grouping and clarity on the
origin, structure and coverage of the tests.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/450
Signed-off-by: Lucas De Marchi <ldemarchi@kernel.org>

diff --git a/scripts/setup-rootfs.sh b/scripts/setup-rootfs.sh
index a8ed99cba2a3e649db4d3c3a34fc33003bd030b1..920e594542d9336b5c3a12a14f65ba4ade21c520 100755 (executable)
--- a/scripts/setup-rootfs.sh
+++ b/scripts/setup-rootfs.sh
@@ -72,10 +72,10 @@ map=(
     ["test-depmod/search-order-override$MODULE_DIRECTORY/4.4.4/override/"]="mod-simple.ko"
     ["test-depmod/check-weakdep$MODULE_DIRECTORY/4.4.4/kernel/mod-weakdep.ko"]="mod-weakdep.ko"
     ["test-depmod/check-weakdep$MODULE_DIRECTORY/4.4.4/kernel/mod-simple.ko"]="mod-simple.ko"
-    ["test-dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/fs/foo/"]="mod-foo-b.ko"
-    ["test-dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/"]="mod-foo-c.ko"
-    ["test-dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/lib/"]="mod-foo-a.ko"
-    ["test-dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/fs/"]="mod-foo.ko"
+    ["test-libkmod/dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/fs/foo/"]="mod-foo-b.ko"
+    ["test-libkmod/dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/"]="mod-foo-c.ko"
+    ["test-libkmod/dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/lib/"]="mod-foo-a.ko"
+    ["test-libkmod/dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/fs/"]="mod-foo.ko"
     ["test-libkmod/init/"]="mod-simple.ko"
     ["test-libkmod/remove/"]="mod-simple.ko"
     ["test-libkmod/remove2/"]="mod-simple.ko"

diff --git a/testsuite/meson.build b/testsuite/meson.build
index 53418c9db235532fa4f7f34156af57d7f68c0e01..4dd2220e91831ca654dad613e65d24313cf62870 100644 (file)
--- a/testsuite/meson.build
+++ b/testsuite/meson.build
@@ -77,7 +77,6 @@ libtestsuite = static_library(
 )
 
 _testsuite = [
-  'test-dependencies',
   'test-depmod',
   'test-libkmod',
   'test-list',

diff --git a/testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.alias b/testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.alias
similarity index 100%
rename from testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.alias
rename to testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.alias

diff --git a/testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.alias.bin b/testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.alias.bin
similarity index 100%
rename from testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.alias.bin
rename to testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.alias.bin

diff --git a/testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.builtin b/testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.builtin
similarity index 100%
rename from testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.builtin
rename to testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.builtin

diff --git a/testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.builtin.bin b/testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.builtin.bin
similarity index 100%
rename from testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.builtin.bin
rename to testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.builtin.bin

diff --git a/testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.dep b/testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.dep
similarity index 100%
rename from testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.dep
rename to testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.dep

diff --git a/testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.dep.bin b/testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.dep.bin
similarity index 100%
rename from testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.dep.bin
rename to testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.dep.bin

diff --git a/testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.devname b/testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.devname
similarity index 100%
rename from testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.devname
rename to testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.devname

diff --git a/testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.order b/testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.order
similarity index 100%
rename from testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.order
rename to testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.order

diff --git a/testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.softdep b/testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.softdep
similarity index 100%
rename from testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.softdep
rename to testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.softdep

diff --git a/testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.symbols b/testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.symbols
similarity index 100%
rename from testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.symbols
rename to testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.symbols

diff --git a/testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.symbols.bin b/testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.symbols.bin
similarity index 100%
rename from testsuite/rootfs-pristine/test-dependencies/lib/modules/4.0.20-kmod/modules.symbols.bin
rename to testsuite/rootfs-pristine/test-libkmod/dependencies/lib/modules/4.0.20-kmod/modules.symbols.bin

diff --git a/testsuite/test-dependencies.c b/testsuite/test-dependencies.c
deleted file mode 100644 (file)
index c00a8be..0000000
--- a/testsuite/test-dependencies.c
+++ /dev/null
@@ -1,70 +0,0 @@
-// SPDX-License-Identifier: LGPL-2.1-or-later
-/*
- * Copyright (C) 2011-2013  ProFUSION embedded systems
- */
-
-#include <inttypes.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <shared/util.h>
-
-#include <libkmod/libkmod.h>
-
-#include "testsuite.h"
-
-#define TEST_UNAME "4.0.20-kmod"
-
-static int test_dependencies(void)
-{
-       struct kmod_ctx *ctx;
-       struct kmod_module *mod = NULL;
-       struct kmod_list *list, *l;
-       int err;
-       size_t len = 0;
-       int fooa = 0, foob = 0, fooc = 0;
-
-       ctx = kmod_new(NULL, NULL);
-       TS_ASSERT(ctx != NULL);
-
-       err = kmod_module_new_from_name(ctx, "mod-foo", &mod);
-       TS_ASSERT(err == 0 && mod != NULL);
-
-       list = kmod_module_get_dependencies(mod);
-
-       kmod_list_foreach(l, list) {
-               struct kmod_module *m = kmod_module_get_module(l);
-               const char *name = kmod_module_get_name(m);
-
-               if (streq(name, "mod_foo_a"))
-                       fooa = 1;
-               if (streq(name, "mod_foo_b"))
-                       foob = 1;
-               else if (streq(name, "mod_foo_c"))
-                       fooc = 1;
-
-               fprintf(stderr, "name=%s", name);
-               kmod_module_unref(m);
-               len++;
-       }
-
-       /* fooa, foob, fooc */
-       TS_ASSERT(len == 3 && fooa && foob && fooc);
-
-       kmod_module_unref_list(list);
-       kmod_module_unref(mod);
-       kmod_unref(ctx);
-
-       return 0;
-}
-DEFINE_TEST(test_dependencies,
-           .description = "test if kmod_module_get_dependencies works",
-           .config = {
-                   [TC_UNAME_R] = TEST_UNAME,
-                   [TC_ROOTFS] = TESTSUITE_ROOTFS "test-dependencies/",
-           });
-
-TESTSUITE_MAIN();

diff --git a/testsuite/test-libkmod.c b/testsuite/test-libkmod.c
index f3abddb234ec5ba0461133a11f54dd298ac6367b..c3b81059c3a73b4de7134044bedab0ee8c867dc6 100644 (file)
--- a/testsuite/test-libkmod.c
+++ b/testsuite/test-libkmod.c
@@ -423,4 +423,55 @@ DEFINE_TEST(loaded_1,
                .out = TESTSUITE_ROOTFS "test-libkmod/loaded/correct.txt",
        });
 
+#define TEST_UNAME "4.0.20-kmod"
+
+static int test_dependencies(void)
+{
+       struct kmod_ctx *ctx;
+       struct kmod_module *mod = NULL;
+       struct kmod_list *list, *l;
+       int err;
+       size_t len = 0;
+       int fooa = 0, foob = 0, fooc = 0;
+
+       ctx = kmod_new(NULL, NULL);
+       TS_ASSERT(ctx != NULL);
+
+       err = kmod_module_new_from_name(ctx, "mod-foo", &mod);
+       TS_ASSERT(err == 0 && mod != NULL);
+
+       list = kmod_module_get_dependencies(mod);
+
+       kmod_list_foreach(l, list) {
+               struct kmod_module *m = kmod_module_get_module(l);
+               const char *name = kmod_module_get_name(m);
+
+               if (streq(name, "mod_foo_a"))
+                       fooa = 1;
+               if (streq(name, "mod_foo_b"))
+                       foob = 1;
+               else if (streq(name, "mod_foo_c"))
+                       fooc = 1;
+
+               fprintf(stderr, "name=%s", name);
+               kmod_module_unref(m);
+               len++;
+       }
+
+       /* fooa, foob, fooc */
+       TS_ASSERT(len == 3 && fooa && foob && fooc);
+
+       kmod_module_unref_list(list);
+       kmod_module_unref(mod);
+       kmod_unref(ctx);
+
+       return 0;
+}
+DEFINE_TEST(test_dependencies,
+           .description = "test if kmod_module_get_dependencies works",
+           .config = {
+                   [TC_UNAME_R] = TEST_UNAME,
+                   [TC_ROOTFS] = TESTSUITE_ROOTFS "test-libkmod/dependencies/",
+           });
+
 TESTSUITE_MAIN();