From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Sun, 6 Apr 2014 20:43:19 +0000 (-0300)
Subject: testsuite: Remove duplicate test
X-Git-Tag: v17~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e68b2c4556020c0c3327641de1bafeaec51b56e;p=thirdparty%2Fkmod.git

testsuite: Remove duplicate test

This partially reverts ad7f175 ("Add test for depmod using search dirs
with same prefix"). Testing it twice in the inverted order doesn't
ensure we get the bug with wrong ordering.

As put by Anssi Hannula <anssi@mageia.org>:

	So the bug is triggered only if the shorter name is higher-prio _and_
	shorter name is traversed first. If the long name is traversed first,
	the bug don't trigger with either "search" directive order (and on my
	"make check" runs this is the case).
---

diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/etc/depmod.d/search.conf b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/etc/depmod.d/search.conf
deleted file mode 100644
index ddf40646..00000000
--- a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/etc/depmod.d/search.conf
+++ /dev/null
@@ -1 +0,0 @@
-search foo foobar built-in
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/correct-modules.dep b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/correct-modules.dep
deleted file mode 100644
index 32f0d2ab..00000000
--- a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/correct-modules.dep
+++ /dev/null
@@ -1 +0,0 @@
-foo/md5.ko:
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko
deleted file mode 100644
index b568f479..00000000
Binary files a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko and /dev/null differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko
deleted file mode 100644
index b568f479..00000000
Binary files a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko and /dev/null differ
diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c
index 25c2e9bc..5b673486 100644
--- a/testsuite/test-depmod.c
+++ b/testsuite/test-depmod.c
@@ -106,33 +106,6 @@ static DEFINE_TEST(depmod_search_order_same_prefix,
 		},
 	});
 
-#define SEARCH_ORDER_SAME_PREFIX2_ROOTFS TESTSUITE_ROOTFS "test-depmod/search-order-same-prefix2"
-static noreturn int depmod_search_order_same_prefix2(const struct test *t)
-{
-	const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
-	const char *const args[] = {
-		progname,
-		NULL,
-	};
-
-	test_spawn_prog(progname, args);
-	exit(EXIT_FAILURE);
-}
-static DEFINE_TEST(depmod_search_order_same_prefix2,
-	.description = "check if depmod honor search order in config with same prefi: "
-			"the same as depmod_search_order_same_prefix, but in inverse order",
-	.config = {
-		[TC_UNAME_R] = "4.4.4",
-		[TC_ROOTFS] = SEARCH_ORDER_SAME_PREFIX2_ROOTFS,
-	},
-	.output = {
-		.files = (const struct keyval[]) {
-			{ SEARCH_ORDER_SAME_PREFIX2_ROOTFS "/lib/modules/4.4.4/correct-modules.dep",
-			  SEARCH_ORDER_SAME_PREFIX2_ROOTFS "/lib/modules/4.4.4/modules.dep" },
-			{ }
-		},
-	});
-
 
 static const struct test *tests[] = {
 #ifdef ENABLE_ZLIB
@@ -140,7 +113,6 @@ static const struct test *tests[] = {
 #endif
 	&sdepmod_search_order_simple,
 	&sdepmod_search_order_same_prefix,
-	&sdepmod_search_order_same_prefix2,
 	NULL,
 };