Hello community,

here is the log from the commit of package kmod for openSUSE:Factory checked in 
at 2015-03-16 06:55:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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        2015-02-25 
02:16:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes   2015-03-16 
06:55:55.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Mar  6 07:58:19 UTC 2015 - meiss...@suse.com
+
+- 0001-use-correct-sort-method-in-test-array.patch: use correct test
+  bsc#920930
+
+-------------------------------------------------------------------

New:
----
  0001-use-correct-sort-method-in-test-array.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kmod.spec ++++++
--- /var/tmp/diff_new_pack.xVQGoM/_old  2015-03-16 06:55:56.000000000 +0100
+++ /var/tmp/diff_new_pack.xVQGoM/_new  2015-03-16 06:55:56.000000000 +0100
@@ -36,6 +36,7 @@
 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
+Patch7:         0001-use-correct-sort-method-in-test-array.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -100,7 +101,7 @@
 
 %prep
 %setup -q
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1
 
 %build
 autoreconf -fi

++++++ 0001-use-correct-sort-method-in-test-array.patch ++++++
>From 813357548c7f9063996783e2ac8382501e32a4ed Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meiss...@suse.de>
Date: Fri, 6 Mar 2015 08:57:10 +0100
Subject: [PATCH] use correct sort method in test-array
Status: mailed to upstream

the pointers we get are char ** not char *
---
 testsuite/test-array.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/testsuite/test-array.c b/testsuite/test-array.c
index 3c72a8a..8e1b2ba 100644
--- a/testsuite/test-array.c
+++ b/testsuite/test-array.c
@@ -90,6 +90,14 @@ static int test_array_append_unique(const struct test *t)
 DEFINE_TEST(test_array_append_unique,
                .description = "test array append unique");
 
+static int array_strcmp(void *a, void *b)
+{
+       char *pa = *(char **)a;
+       char *pb = *(char **)b;
+
+       return strcmp(pa, pb);
+}
+
 static int test_array_sort(const struct test *t)
 {
        struct array array;
@@ -104,7 +112,7 @@ static int test_array_sort(const struct test *t)
        array_append(&array, c2);
        array_append(&array, c3);
        array_append(&array, c1);
-       array_sort(&array, (int (*)(const void *a, const void *b)) strcmp);
+       array_sort(&array, (int (*)(const void *a, const void *b)) 
array_strcmp);
        assert_return(array.count == 6, EXIT_FAILURE);
        assert_return(array.array[0] == c1, EXIT_FAILURE);
        assert_return(array.array[1] == c1, EXIT_FAILURE);
-- 
2.1.4


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to