build: swap ABS_TOP_BUILDDIR for TOOLS_DIR

All the remaining instances are used to track the tools directory (aka
the local symlinks to kmod). Rename accordingly and include the tools
sub-directory.

Similar to the OVERRIDE_LIBDIR change earlier, this is build system
specific layout, which shouldn't be in the tests.

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

diff --git a/Makefile.am b/Makefile.am
index 013569864ac86d06aa59c47d037844a27fdcc12f..5cd2f7fd88b1b2b0d6f3a912d7175c0c75adce39 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -242,7 +242,7 @@ testsuite_init_module_la_LIBADD = libkmod/libkmod-internal.la
 
 TESTSUITE_CPPFLAGS = $(AM_CPPFLAGS) \
        -DTESTSUITE_ROOTFS=\"$(abs_top_builddir)/$(ROOTFS)/\" \
-       -DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\" \
+       -DTOOLS_DIR=\"$(abs_top_builddir)/tools\" \
        -DOVERRIDE_LIBDIR=\"$(abs_top_builddir)/testsuite/.libs/\"
 TESTSUITE_LDADD = \
        testsuite/libtestsuite.la libkmod/libkmod-internal.la \

diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c
index d5aba2306b6af9949159d15c5500b193e8a43c9a..65302f837a176c2b253142eda06ff3d24577c3cf 100644 (file)
--- a/testsuite/test-depmod.c
+++ b/testsuite/test-depmod.c
@@ -18,7 +18,7 @@
 #define MODULES_ORDER_LIB_MODULES MODULES_ORDER_ROOTFS MODULE_DIRECTORY "/" MODULES_UNAME
 static noreturn int depmod_modules_order_for_compressed(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
+       const char *progname = TOOLS_DIR "/depmod";
        const char *const args[] = {
                progname,
                NULL,
@@ -47,7 +47,7 @@ DEFINE_TEST(depmod_modules_order_for_compressed,
 #define MODULES_OUTDIR_LIB_MODULES_INPUT MODULES_OUTDIR_ROOTFS MODULE_DIRECTORY "/" MODULES_UNAME
 static noreturn int depmod_modules_outdir(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
+       const char *progname = TOOLS_DIR "/depmod";
        const char *const args[] = {
                progname,
                "--outdir", MODULES_OUTDIR_ROOTFS "/outdir/",
@@ -78,7 +78,7 @@ DEFINE_TEST(depmod_modules_outdir,
 #define SEARCH_ORDER_SIMPLE_LIB_MODULES SEARCH_ORDER_SIMPLE_ROOTFS MODULE_DIRECTORY "/" MODULES_UNAME
 static noreturn int depmod_search_order_simple(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
+       const char *progname = TOOLS_DIR "/depmod";
        const char *const args[] = {
                progname,
                NULL,
@@ -105,7 +105,7 @@ DEFINE_TEST(depmod_search_order_simple,
 #define SEARCH_ORDER_SAME_PREFIX_LIB_MODULES SEARCH_ORDER_SAME_PREFIX_ROOTFS MODULE_DIRECTORY "/" MODULES_UNAME
 static noreturn int depmod_search_order_same_prefix(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
+       const char *progname = TOOLS_DIR "/depmod";
        const char *const args[] = {
                progname,
                NULL,
@@ -131,7 +131,7 @@ DEFINE_TEST(depmod_search_order_same_prefix,
 #define DETECT_LOOP_ROOTFS TESTSUITE_ROOTFS "test-depmod/detect-loop"
 static noreturn int depmod_detect_loop(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
+       const char *progname = TOOLS_DIR "/depmod";
        const char *const args[] = {
                progname,
                NULL,
@@ -155,7 +155,7 @@ DEFINE_TEST(depmod_detect_loop,
 #define SEARCH_ORDER_EXTERNAL_FIRST_LIB_MODULES SEARCH_ORDER_EXTERNAL_FIRST_ROOTFS MODULE_DIRECTORY "/" MODULES_UNAME
 static noreturn int depmod_search_order_external_first(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
+       const char *progname = TOOLS_DIR "/depmod";
        const char *const args[] = {
                progname,
                NULL,
@@ -182,7 +182,7 @@ DEFINE_TEST(depmod_search_order_external_first,
 #define SEARCH_ORDER_EXTERNAL_LAST_LIB_MODULES SEARCH_ORDER_EXTERNAL_LAST_ROOTFS MODULE_DIRECTORY "/" MODULES_UNAME
 static noreturn int depmod_search_order_external_last(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
+       const char *progname = TOOLS_DIR "/depmod";
        const char *const args[] = {
                progname,
                NULL,
@@ -209,7 +209,7 @@ DEFINE_TEST(depmod_search_order_external_last,
 #define SEARCH_ORDER_OVERRIDE_LIB_MODULES SEARCH_ORDER_OVERRIDE_ROOTFS MODULE_DIRECTORY "/" MODULES_UNAME
 static noreturn int depmod_search_order_override(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
+       const char *progname = TOOLS_DIR "/depmod";
        const char *const args[] = {
                progname,
                NULL,
@@ -236,7 +236,7 @@ DEFINE_TEST(depmod_search_order_override,
 #define CHECK_WEAKDEP_LIB_MODULES CHECK_WEAKDEP_ROOTFS MODULE_DIRECTORY "/" MODULES_UNAME
 static noreturn int depmod_check_weakdep(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
+       const char *progname = TOOLS_DIR "/depmod";
        const char *const args[] = {
                progname,
                NULL,

diff --git a/testsuite/test-modinfo.c b/testsuite/test-modinfo.c
index 2157a11cfc15746a29caf966d035f866c7642c5c..ab161ec4916b0ed1800442c3a0b95bc28ed6ce14 100644 (file)
--- a/testsuite/test-modinfo.c
+++ b/testsuite/test-modinfo.c
@@ -13,7 +13,7 @@
 
 #include "testsuite.h"
 
-static const char *progname = ABS_TOP_BUILDDIR "/tools/modinfo";
+static const char *progname = TOOLS_DIR "/modinfo";
 
 #define DEFINE_MODINFO_TEST(_field, _flavor, ...) \
 static noreturn int test_modinfo_##_field(const struct test *t) \

diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index 534503dcaefe0579385a44bc1421fee0b8ff0e49..39c19014aa99fbf417145714fd3018fb67aeb32b 100644 (file)
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -15,7 +15,7 @@
 
 static noreturn int modprobe_show_depends(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "--show-depends", "mod-loop-a",
@@ -37,7 +37,7 @@ DEFINE_TEST(modprobe_show_depends,
 
 static noreturn int modprobe_show_depends2(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "--show-depends", "mod-simple",
@@ -60,7 +60,7 @@ DEFINE_TEST(modprobe_show_depends2,
 
 static noreturn int modprobe_show_alias_to_none(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "--show-depends", "--ignore-install", "--quiet", "mod-simple",
@@ -85,7 +85,7 @@ DEFINE_TEST(modprobe_show_alias_to_none,
 
 static noreturn int modprobe_show_exports(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "--show-exports", "--quiet", "/mod-loop-a.ko",
@@ -108,7 +108,7 @@ DEFINE_TEST(modprobe_show_exports,
 
 static noreturn int modprobe_builtin(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "unix",
@@ -127,7 +127,7 @@ DEFINE_TEST(modprobe_builtin,
 
 static noreturn int modprobe_builtin_lookup_only(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "-R", "unix",
@@ -149,7 +149,7 @@ DEFINE_TEST(modprobe_builtin_lookup_only,
 
 static noreturn int modprobe_softdep_loop(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "mod-loop-b",
@@ -171,7 +171,7 @@ DEFINE_TEST(modprobe_softdep_loop,
 
 static noreturn int modprobe_weakdep_loop(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "mod-loop-b",
@@ -194,7 +194,7 @@ DEFINE_TEST(modprobe_weakdep_loop,
 
 static noreturn int modprobe_install_cmd_loop(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "mod-loop-a",
@@ -212,7 +212,7 @@ DEFINE_TEST(modprobe_install_cmd_loop,
                [TC_INIT_MODULE_RETCODES] = "",
        },
        .env_vars = (const struct keyval[]) {
-               { "MODPROBE", ABS_TOP_BUILDDIR "/tools/modprobe" },
+               { "MODPROBE", TOOLS_DIR "/modprobe" },
                { }
                },
        .modules_loaded = "mod-loop-b,mod-loop-a",
@@ -220,7 +220,7 @@ DEFINE_TEST(modprobe_install_cmd_loop,
 
 static noreturn int modprobe_param_kcmdline_show_deps(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "--show-depends", "mod-simple",
@@ -244,7 +244,7 @@ DEFINE_TEST(modprobe_param_kcmdline_show_deps,
 
 static noreturn int modprobe_param_kcmdline(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "-c",
@@ -341,7 +341,7 @@ DEFINE_TEST_WITH_FUNC(modprobe_param_kcmdline8, modprobe_param_kcmdline,
 
 static noreturn int modprobe_force(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "--force", "mod-simple",
@@ -363,7 +363,7 @@ DEFINE_TEST(modprobe_force,
 
 static noreturn int modprobe_oldkernel(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "mod-simple",
@@ -385,7 +385,7 @@ DEFINE_TEST(modprobe_oldkernel,
 
 static noreturn int modprobe_oldkernel_force(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "--force", "mod-simple",
@@ -407,7 +407,7 @@ DEFINE_TEST(modprobe_oldkernel_force,
 
 static noreturn int modprobe_external(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "mod-simple",
@@ -429,7 +429,7 @@ DEFINE_TEST(modprobe_external,
 
 static noreturn int modprobe_module_from_abspath(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "/home/foo/mod-simple.ko",
@@ -451,7 +451,7 @@ DEFINE_TEST(modprobe_module_from_abspath,
 
 static noreturn int modprobe_module_from_relpath(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
+       const char *progname = TOOLS_DIR "/modprobe";
        const char *const args[] = {
                progname,
                "./mod-simple.ko",