From 3e68b2c4556020c0c3327641de1bafeaec51b56e Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Sun, 6 Apr 2014 17:43:19 -0300 Subject: [PATCH] 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 : 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). --- .../etc/depmod.d/search.conf | 1 - .../lib/modules/4.4.4/correct-modules.dep | 1 - .../lib/modules/4.4.4/foo/md5.ko | Bin 6391 -> 0 bytes .../lib/modules/4.4.4/foobar/md5.ko | Bin 6391 -> 0 bytes testsuite/test-depmod.c | 28 --------------------- 5 files changed, 30 deletions(-) delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/etc/depmod.d/search.conf delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/correct-modules.dep delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko 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 ddf4064..0000000 --- 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 32f0d2a..0000000 --- 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 b568f47918a85426739e0bdd0605660faaa5fc15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6391 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