Skip to content

Commit

Permalink
testsuite/test-weakdep: remove custom handling
Browse files Browse the repository at this point in the history
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 <[email protected]>
Link: #258
Signed-off-by: Lucas De Marchi <[email protected]>
  • Loading branch information
evelikov authored and lucasdemarchi committed Nov 29, 2024
1 parent 62eaff4 commit 1359eeb
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions testsuite/test-weakdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@

#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",
Expand All @@ -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);

Expand Down

0 comments on commit 1359eeb

Please sign in to comment.