diff --git a/tests-Fix-new-ID-type-handling-in-argument_from_va_list-test.patch b/tests-Fix-new-ID-type-handling-in-argument_from_va_list-test.patch new file mode 100644 index 0000000..da0ff83 --- /dev/null +++ b/tests-Fix-new-ID-type-handling-in-argument_from_va_list-test.patch @@ -0,0 +1,55 @@ +From patchwork Thu Feb 23 12:47:41 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: tests: Fix "new ID" type handling in argument_from_va_list test +From: Carlos Garnacho +X-Patchwork-Id: 140495 +Message-Id: <20170223124741.471-1-carlosg@gnome.org> +To: wayland-devel@lists.freedesktop.org +Cc: Carlos Garnacho +Date: Thu, 23 Feb 2017 13:47:41 +0100 + +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 +--- + 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); + } diff --git a/wayland.spec b/wayland.spec index c3309f9..acf3c81 100644 --- a/wayland.spec +++ b/wayland.spec @@ -6,6 +6,8 @@ Summary: Wayland Compositor Infrastructure License: MIT URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz +# Fix the tests to pass on ppc64 +Patch0: tests-Fix-new-ID-type-handling-in-argument_from_va_list-test.patch BuildRequires: chrpath BuildRequires: docbook-style-xsl @@ -67,6 +69,8 @@ Wayland server library %prep %setup -q +%patch0 -p1 + %build %configure --disable-static --enable-documentation