From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Wed, 11 Feb 2015 00:19:53 +0000 (-0200)
Subject: testsuite: port alias-to-none test to module-playground
X-Git-Tag: v20~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf0b87f4e63eb7822a52f53fc85f043bc88f9779;p=thirdparty%2Fkmod.git

testsuite: port alias-to-none test to module-playground
---

diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh
index 46c65ad4..d4b485a1 100755
--- a/testsuite/populate-modules.sh
+++ b/testsuite/populate-modules.sh
@@ -30,6 +30,7 @@ map=(
     ["test-modprobe/force/lib/modules/4.4.4/kernel/"]="mod-simple.ko"
     ["test-modprobe/oldkernel/lib/modules/3.3.3/kernel/"]="mod-simple.ko"
     ["test-modprobe/oldkernel-force/lib/modules/3.3.3/kernel/"]="mod-simple.ko"
+    ["test-modprobe/alias-to-none/lib/modules/4.4.4/kernel/"]="mod-simple.ko"
 )
 
 for k in ${!map[@]}; do
diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/correct-psmouse.txt b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/correct.txt
similarity index 100%
rename from testsuite/rootfs-pristine/test-modprobe/alias-to-none/correct-psmouse.txt
rename to testsuite/rootfs-pristine/test-modprobe/alias-to-none/correct.txt
diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/etc/modprobe.d/bogus.conf b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/etc/modprobe.d/bogus.conf
index 14bed0b0..fe0d1b43 100644
--- a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/etc/modprobe.d/bogus.conf
+++ b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/etc/modprobe.d/bogus.conf
@@ -1 +1 @@
-alias psmouse deaddood
+alias mod-simple deaddood
diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko
deleted file mode 100644
index 4eac2a3d..00000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/kernel/drivers/input/mouse/psmouse.ko and /dev/null differ
diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias
index a4e76770..ba76e181 100644
--- a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias
+++ b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias
@@ -1,3 +1 @@
 # Aliases extracted from modules themselves.
-alias serio:ty05pr*id*ex* psmouse
-alias serio:ty01pr*id*ex* psmouse
diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias.bin
index 0b135371..7075435f 100644
Binary files a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias.bin and b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.alias.bin differ
diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep
index 7ba57117..54766537 100644
--- a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep
+++ b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep
@@ -1 +1 @@
-kernel/drivers/input/mouse/psmouse.ko:
+kernel/mod-simple.ko:
diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep.bin
index bdd0eb5f..b09a8543 100644
Binary files a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep.bin and b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.dep.bin differ
diff --git a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.softdep
index 3cc05126..5554ccca 100644
--- a/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.softdep
+++ b/testsuite/rootfs-pristine/test-modprobe/alias-to-none/lib/modules/4.4.4/modules.softdep
@@ -1,2 +1 @@
 # Soft dependencies extracted from modules themselves.
-# Copy, with a .conf extension, to /etc/modprobe.d to use it with modprobe.
diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index d4bcf1af..8972d989 100644
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -75,7 +75,7 @@ static noreturn int modprobe_show_alias_to_none(const struct test *t)
 	const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
 	const char *const args[] = {
 		progname,
-		"--show-depends", "--ignore-install", "--quiet", "psmouse",
+		"--show-depends", "--ignore-install", "--quiet", "mod-simple",
 		NULL,
 	};
 
@@ -89,7 +89,7 @@ DEFINE_TEST(modprobe_show_alias_to_none,
 		[TC_ROOTFS] = TESTSUITE_ROOTFS "test-modprobe/alias-to-none",
 	},
 	.output = {
-		.out = TESTSUITE_ROOTFS "test-modprobe/alias-to-none/correct-psmouse.txt",
+		.out = TESTSUITE_ROOTFS "test-modprobe/alias-to-none/correct.txt",
 	},
 	.modules_loaded = "",
 	);