jengelh/kmod
SHA256
1
0
Fork 0
forked from pool/kmod
Code Pull Requests Activity

Accepting request 287247 from Base:System

Browse Source 
- kmod-blacklist-fixtest.patch: tag the test in test-blacklist correctly

OBS-URL: https://build.opensuse.org/request/show/287247
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmod?expand=0&rev=29
This commit is contained in:
Dominique Leuenberger 2015-02-25 01:16:27 +00:00 committed by Git OBS Bridge
commit dcfbc23541
3 changed files with 60 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
kmod-blacklist-fixtest.patch Normal file
View File

@ -0,0 +1,51 @@
In upstream git:
0af8f786c0bae8c10d9b463d72e72cc6e80c26a2
From: Marcus Meissner
and
d2db083ab6f8491e806c72888d897d15584f9f17
From: Lucas De Marchi
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();
Index: kmod-19/testsuite/test-dependencies.c
===================================================================
--- kmod-19.orig/testsuite/test-dependencies.c
+++ kmod-19/testsuite/test-dependencies.c
@@ -76,15 +76,13 @@ static int test_dependencies(const struc
return EXIT_SUCCESS;
}
-static const struct test stest_dependencies = {
- .name = "test_dependencies",
+DEFINE_TEST(test_dependencies,
.description = "test if kmod_module_get_dependencies works",
- .func = test_dependencies,
.config = {
[TC_ROOTFS] = TESTSUITE_ROOTFS "test-dependencies/",
[TC_UNAME_R] = TEST_UNAME,
},
.need_spawn = true,
-};
+)
TESTSUITE_MAIN();

5
kmod.changes
View File

@ -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

7
kmod.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package kmod
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -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
@ -154,7 +155,7 @@ ln -s "%_libdir/libkmod.so.2.2.9" "$b/%_lib/";
%endif
%check
make check
make check V=1
%post -n %lname -p /sbin/ldconfig