diff --git a/kmod-blacklist-fixtest.patch b/kmod-blacklist-fixtest.patch new file mode 100644 index 0000000..98c5c57 --- /dev/null +++ b/kmod-blacklist-fixtest.patch @@ -0,0 +1,22 @@ +Index: kmod-19/testsuite/test-blacklist.c +=================================================================== +--- kmod-19.orig/testsuite/test-blacklist.c ++++ kmod-19/testsuite/test-blacklist.c +@@ -92,14 +92,13 @@ fail_lookup: + kmod_unref(ctx); + return EXIT_FAILURE; + } +-static const struct test sblacklist_1 = { +- .name = "blacklist_1", ++ ++DEFINE_TEST(blacklist_1, + .description = "check if modules are correctly blacklisted", +- .func = blacklist_1, + .config = { + [TC_ROOTFS] = TESTSUITE_ROOTFS "test-blacklist/", + }, + .need_spawn = true, +-}; ++); + + TESTSUITE_MAIN(); diff --git a/kmod.changes b/kmod.changes index 9d835ff..169c881 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 22 10:41:40 UTC 2015 - meissner@suse.com + +- kmod-blacklist-fixtest.patch: tag the test in test-blacklist correctly + ------------------------------------------------------------------- Sun Nov 16 20:54:36 UTC 2014 - jengelh@inai.de diff --git a/kmod.spec b/kmod.spec index e863326..3cb51e7 100644 --- a/kmod.spec +++ b/kmod.spec @@ -35,6 +35,7 @@ Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch +Patch6: kmod-blacklist-fixtest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -99,7 +100,7 @@ in %lname. %prep %setup -q -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1 %build autoreconf -fi