testsuite: Move test-alias to test-util

Move file so we can use the same file to test other functions from
libkmod-util.c

diff --git a/Makefile.am b/Makefile.am
index 1c1e5f7..bdf758e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -176,7 +176,7 @@ testsuite_libtestsuite_la_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
 testsuite_libtestsuite_la_LIBADD = -lrt
 
 TESTSUITE = testsuite/test-init testsuite/test-testsuite testsuite/test-loaded \
-           testsuite/test-modinfo testsuite/test-alias testsuite/test-new-module \
+           testsuite/test-modinfo testsuite/test-util testsuite/test-new-module \
            testsuite/test-modprobe testsuite/test-blacklist \
            testsuite/test-dependencies testsuite/test-depmod
 
@@ -191,8 +191,8 @@ testsuite_test_loaded_LDADD = $(TESTSUITE_LDADD)
 testsuite_test_loaded_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
 testsuite_test_modinfo_LDADD = $(TESTSUITE_LDADD)
 testsuite_test_modinfo_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
-testsuite_test_alias_LDADD = $(TESTSUITE_LDADD)
-testsuite_test_alias_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
+testsuite_test_util_LDADD = $(TESTSUITE_LDADD)
+testsuite_test_util_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
 testsuite_test_new_module_LDADD = $(TESTSUITE_LDADD)
 testsuite_test_new_module_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
 testsuite_test_modprobe_LDADD = $(TESTSUITE_LDADD)

diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index 71f34cc..bd26a40 100644 (file)
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -2,7 +2,7 @@
 *.la
 *.so
 /.dirstamp
-/test-alias
+/test-util
 /test-blacklist
 /test-dependencies
 /test-depmod
@@ -14,8 +14,8 @@
 /test-modprobe
 /rootfs
 /stamp-rootfs
-/test-alias.log
-/test-alias.trs
+/test-util.log
+/test-util.trs
 /test-blacklist.log
 /test-blacklist.trs
 /test-dependencies.log

diff --git a/testsuite/rootfs-pristine/test-alias/correct.txt b/testsuite/rootfs-pristine/test-util/alias-correct.txt
similarity index 100%
rename from testsuite/rootfs-pristine/test-alias/correct.txt
rename to testsuite/rootfs-pristine/test-util/alias-correct.txt

diff --git a/testsuite/test-alias.c b/testsuite/test-util.c
similarity index 94%
rename from testsuite/test-alias.c
rename to testsuite/test-util.c
index 4d1d8d3..db9f134 100644 (file)
--- a/testsuite/test-alias.c
+++ b/testsuite/test-util.c
@@ -60,11 +60,11 @@ static int alias_1(const struct test *t)
 static DEFINE_TEST(alias_1,
        .description = "check if alias_normalize does the right thing",
        .config = {
-               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-alias/",
+               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-util/",
        },
        .need_spawn = true,
        .output = {
-               .out = TESTSUITE_ROOTFS "test-alias/correct.txt",
+               .out = TESTSUITE_ROOTFS "test-util/alias-correct.txt",
        });
 
 static const struct test *tests[] = {