From f7af779bb94c69c53d0f28ec7a194780b4f6db079e4c64e0e0c9d7a4e70c3436 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 15 Mar 2017 11:56:15 +0000 Subject: [PATCH] - Add 0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch to resolve testsuite failure on s390x OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=74 --- ...-type-handling-in-argument_from_va_l.patch | 53 +++++++++++++++++++ wayland.changes | 6 +++ wayland.spec | 2 + 3 files changed, 61 insertions(+) create mode 100644 0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch diff --git a/0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch b/0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch new file mode 100644 index 0000000..4299b69 --- /dev/null +++ b/0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch @@ -0,0 +1,53 @@ +From 680a6b32de49896dc290968f83a1e4cce315888e Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho +Date: Thu, 23 Feb 2017 13:47:41 +0100 +Subject: [PATCH] tests: Fix "new ID" type handling in argument_from_va_list + test + +New IDs are internally dealt with as objects, however this test +expected to deal with 'n' as the uint32_t type that's just seen +through the wire. We should give it an object instead, and +expect an object from it. + +https://bugs.freedesktop.org/show_bug.cgi?id=99899 + +Signed-off-by: Carlos Garnacho +Reviewed-by: Pekka Paalanen +Tested-by: Kalev Lember +Reviewed-by: Yong Bakos +--- + tests/connection-test.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/connection-test.c b/tests/connection-test.c +index 1c688f1..8be6c38 100644 +--- a/tests/connection-test.c ++++ b/tests/connection-test.c +@@ -142,7 +142,7 @@ va_list_wrapper(const char *signature, union wl_argument *args, int count, ...) + TEST(argument_from_va_list) + { + union wl_argument args[WL_CLOSURE_MAX_ARGS]; +- struct wl_object fake_object; ++ struct wl_object fake_object, fake_new_object; + struct wl_array fake_array; + + va_list_wrapper("i", args, 1, 100); +@@ -154,13 +154,13 @@ TEST(argument_from_va_list) + + va_list_wrapper("?iuf?sonah", args, 8, + 102, 103, wl_fixed_from_int(104), "value", +- &fake_object, 105, &fake_array, 106); ++ &fake_object, &fake_new_object, &fake_array, 106); + assert(args[0].i == 102); + assert(args[1].u == 103); + assert(args[2].f == wl_fixed_from_int(104)); + assert(strcmp(args[3].s, "value") == 0); + assert(args[4].o == &fake_object); +- assert(args[5].n == 105); ++ assert(args[5].o == &fake_new_object); + assert(args[6].a == &fake_array); + assert(args[7].h == 106); + } +-- +2.12.0 + diff --git a/wayland.changes b/wayland.changes index f597357..055e54b 100644 --- a/wayland.changes +++ b/wayland.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 15 11:53:21 UTC 2017 - jengelh@inai.de + +- Add 0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch + to resolve testsuite failure on s390x + ------------------------------------------------------------------- Tue Feb 21 22:33:07 UTC 2017 - jengelh@inai.de diff --git a/wayland.spec b/wayland.spec index de9a0b5..01541d0 100644 --- a/wayland.spec +++ b/wayland.spec @@ -31,6 +31,7 @@ Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz Source2: http://wayland.freedesktop.org/releases/%name-%version.tar.xz.sig Source3: %name.keyring Source4: baselibs.conf +Patch1: 0001-tests-Fix-new-ID-type-handling-in-argument_from_va_l.patch #git#BuildRequires: autoconf >= 2.64 #git#BuildRequires: automake >= 1.11 #git#BuildRequires: libtool >= 2.2 @@ -120,6 +121,7 @@ This subpackage contains the documentation to Wayland. %prep %setup -q +%patch -P 1 -p1 %build if [ ! -e configure ]; then