]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
testsuite/test-weakdep: remove custom handling
authorEmil Velikov <emil.l.velikov@gmail.com>
Thu, 21 Nov 2024 17:53:47 +0000 (17:53 +0000)
committerLucas De Marchi <lucas.de.marchi@gmail.com>
Fri, 29 Nov 2024 15:48:29 +0000 (09:48 -0600)
Currently test-weakdep is the only test which explicitly sets the kernel
module lookup directory and the modprobe.d location. It does so by
explicitly hard-coding the full path for both, thus effectively
bypassing the path handling done in our `LD_PRELOAD` module `path.so`.

Just use `kmod_new(NULL, NULL);` which will ensure that everything is
handled relatively to `TC_ROOTFS` defined further down in the test.

Note: this technically reduces our test coverage, although kmod_new() is
not the goal of this test and should be handled separately.

Noticed while removing the TESTSUITE_ROOTFS instances from DEFINE_TEST()

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/258
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
testsuite/test-weakdep.c

index ca75349aaa6cfc3ed23abe144fee0073fb79a525..fdde0b2b89807721bfa43a7a622182beac948101 100644 (file)
 
 #include "testsuite.h"
 
-#define TEST_WEAKDEP_ROOTFS TESTSUITE_ROOTFS "test-weakdep/"
-#define TEST_WEAKDEP_KERNEL_DIR TEST_WEAKDEP_ROOTFS MODULE_DIRECTORY "/4.4.4/"
-
-static const char *const test_weakdep_config_paths[] = {
-       TEST_WEAKDEP_ROOTFS SYSCONFDIR "/modprobe.d",
-       NULL,
-};
-
 static const char *const mod_name[] = {
        "mod-loop-b",
        "mod-weakdep",
@@ -35,7 +27,7 @@ static int test_weakdep(const struct test *t)
        int mod_name_index = 0;
        int err;
 
-       ctx = kmod_new(TEST_WEAKDEP_KERNEL_DIR, test_weakdep_config_paths);
+       ctx = kmod_new(NULL, NULL);
        if (ctx == NULL)
                exit(EXIT_FAILURE);