Hello community,
here is the log from the commit of package kmod for openSUSE:Factory checked in
at 2015-02-25 02:16:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmod"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2014-11-29
08:39:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2015-02-25
02:16:29.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Feb 22 10:41:40 UTC 2015 - meiss...@suse.com
+
+- kmod-blacklist-fixtest.patch: tag the test in test-blacklist correctly
+
+-------------------------------------------------------------------
New:
----
kmod-blacklist-fixtest.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmod.spec ++++++
--- /var/tmp/diff_new_pack.SbAcZH/_old 2015-02-25 02:16:30.000000000 +0100
+++ /var/tmp/diff_new_pack.SbAcZH/_new 2015-02-25 02:16:30.000000000 +0100
@@ -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 @@
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 @@
%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 @@
%endif
%check
-make check
+make check V=1
%post -n %lname -p /sbin/ldconfig
++++++ kmod-blacklist-fixtest.patch ++++++
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();
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
