From: Emil Velikov Date: Sat, 18 Jul 2026 14:06:14 +0000 (+0100) Subject: testsuite: fold test-initstate into test-libkmod X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=376860ef86e4aab899af94eaf880e500846901d4;p=thirdparty%2Fkmod.git testsuite: fold test-initstate 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 Link: https://github.com/kmod-project/kmod/pull/450 Signed-off-by: Lucas De Marchi --- diff --git a/testsuite/meson.build b/testsuite/meson.build index 69aceb67..a6abe39c 100644 --- a/testsuite/meson.build +++ b/testsuite/meson.build @@ -80,7 +80,6 @@ _testsuite = [ 'test-blacklist', 'test-dependencies', 'test-depmod', - 'test-initstate', 'test-libkmod', 'test-list', 'test-loaded', diff --git a/testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.alias similarity index 100% rename from testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.alias rename to testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.alias diff --git a/testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.alias.bin similarity index 100% rename from testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.alias.bin rename to testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.alias.bin diff --git a/testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.builtin b/testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.builtin similarity index 100% rename from testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.builtin rename to testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.builtin diff --git a/testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.builtin.bin b/testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.builtin.bin similarity index 100% rename from testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.builtin.bin rename to testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.builtin.bin diff --git a/testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.dep similarity index 100% rename from testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.dep rename to testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.dep diff --git a/testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.dep.bin b/testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.dep.bin similarity index 100% rename from testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.dep.bin rename to testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.dep.bin diff --git a/testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.devname b/testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.devname similarity index 100% rename from testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.devname rename to testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.devname diff --git a/testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.softdep similarity index 100% rename from testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.softdep rename to testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.softdep diff --git a/testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.symbols b/testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.symbols similarity index 100% rename from testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.symbols rename to testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.symbols diff --git a/testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.symbols.bin b/testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.symbols.bin similarity index 100% rename from testsuite/rootfs-pristine/test-initstate/lib/modules/4.4.4/modules.symbols.bin rename to testsuite/rootfs-pristine/test-libkmod/initstate/lib/modules/4.4.4/modules.symbols.bin diff --git a/testsuite/test-initstate.c b/testsuite/test-initstate.c deleted file mode 100644 index 33eda158..00000000 --- a/testsuite/test-initstate.c +++ /dev/null @@ -1,86 +0,0 @@ -// SPDX-License-Identifier: LGPL-2.1-or-later -/* - * Copyright (C) 2015 Intel Corporation. All rights reserved. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -#include "testsuite.h" - -static int test_initstate_from_lookup(void) -{ - struct kmod_ctx *ctx; - struct kmod_list *list = NULL; - struct kmod_module *mod; - const char *null_config = NULL; - int err, r; - - ctx = kmod_new(NULL, &null_config); - TS_ASSERT(ctx != NULL); - - err = kmod_module_new_from_lookup(ctx, "fake-builtin", &list); - TS_ASSERT(err == 0); - TS_ASSERT(list != NULL); - - mod = kmod_module_get_module(list); - - r = kmod_module_get_initstate(mod); - TS_ASSERT(r == KMOD_MODULE_BUILTIN); - - kmod_module_unref(mod); - kmod_module_unref_list(list); - kmod_unref(ctx); - - return 0; -} -DEFINE_TEST( - test_initstate_from_lookup, - .description = - "test if libkmod return correct initstate for builtin module from lookup", - .config = { - [TC_ROOTFS] = TESTSUITE_ROOTFS "test-initstate", - [TC_UNAME_R] = "4.4.4", - }); - -static int test_initstate_from_name(void) -{ - struct kmod_ctx *ctx; - struct kmod_module *mod = NULL; - const char *null_config = NULL; - int err, r; - - ctx = kmod_new(NULL, &null_config); - TS_ASSERT(ctx != NULL); - - err = kmod_module_new_from_name(ctx, "fake-builtin", &mod); - TS_ASSERT(err == 0); - TS_ASSERT(mod != NULL); - - r = kmod_module_get_initstate(mod); - TS_ASSERT(r == KMOD_MODULE_BUILTIN); - - kmod_module_unref(mod); - kmod_unref(ctx); - - return 0; -} -DEFINE_TEST(test_initstate_from_name, - .description = - "test if libkmod return correct initstate for builtin module from name", - .config = { - [TC_ROOTFS] = TESTSUITE_ROOTFS "test-initstate", - [TC_UNAME_R] = "4.4.4", - }); - -TESTSUITE_MAIN(); diff --git a/testsuite/test-libkmod.c b/testsuite/test-libkmod.c index d5213be6..1467b21f 100644 --- a/testsuite/test-libkmod.c +++ b/testsuite/test-libkmod.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1-or-later /* * Copyright (C) 2012-2013 ProFUSION embedded systems + * Copyright (C) 2015 Intel Corporation. All rights reserved. * Copyright © 2025 Intel Corporation */ @@ -250,4 +251,69 @@ DEFINE_TEST(from_alias, .out = TESTSUITE_ROOTFS "test-libkmod/new-from-alias/correct.txt", }); +static int test_initstate_from_lookup(void) +{ + struct kmod_ctx *ctx; + struct kmod_list *list = NULL; + struct kmod_module *mod; + const char *null_config = NULL; + int err, r; + + ctx = kmod_new(NULL, &null_config); + TS_ASSERT(ctx != NULL); + + err = kmod_module_new_from_lookup(ctx, "fake-builtin", &list); + TS_ASSERT(err == 0); + TS_ASSERT(list != NULL); + + mod = kmod_module_get_module(list); + + r = kmod_module_get_initstate(mod); + TS_ASSERT(r == KMOD_MODULE_BUILTIN); + + kmod_module_unref(mod); + kmod_module_unref_list(list); + kmod_unref(ctx); + + return 0; +} +DEFINE_TEST( + test_initstate_from_lookup, + .description = + "test if libkmod return correct initstate for builtin module from lookup", + .config = { + [TC_ROOTFS] = TESTSUITE_ROOTFS "test-libkmod/initstate/", + [TC_UNAME_R] = "4.4.4", + }); + +static int test_initstate_from_name(void) +{ + struct kmod_ctx *ctx; + struct kmod_module *mod = NULL; + const char *null_config = NULL; + int err, r; + + ctx = kmod_new(NULL, &null_config); + TS_ASSERT(ctx != NULL); + + err = kmod_module_new_from_name(ctx, "fake-builtin", &mod); + TS_ASSERT(err == 0); + TS_ASSERT(mod != NULL); + + r = kmod_module_get_initstate(mod); + TS_ASSERT(r == KMOD_MODULE_BUILTIN); + + kmod_module_unref(mod); + kmod_unref(ctx); + + return 0; +} +DEFINE_TEST(test_initstate_from_name, + .description = + "test if libkmod return correct initstate for builtin module from name", + .config = { + [TC_ROOTFS] = TESTSUITE_ROOTFS "test-libkmod/initstate/", + [TC_UNAME_R] = "4.4.4", + }); + TESTSUITE_MAIN();