From 168522c5bc07248281f25765b0481864f0d47198 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 9 Nov 2022 15:29:03 +0000 Subject: [PATCH] Fix s390x --- 0001-trivial-Fix-the-tests-on-s390x.patch | 40 +++++++++++++++++++++++ fwupd.spec | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 0001-trivial-Fix-the-tests-on-s390x.patch diff --git a/0001-trivial-Fix-the-tests-on-s390x.patch b/0001-trivial-Fix-the-tests-on-s390x.patch new file mode 100644 index 0000000..b317d70 --- /dev/null +++ b/0001-trivial-Fix-the-tests-on-s390x.patch @@ -0,0 +1,40 @@ +From 1a31c35732db748af7af8d7d123d148582376251 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Wed, 9 Nov 2022 15:28:06 +0000 +Subject: [PATCH] trivial: Fix the tests on s390x + +--- + plugins/synaptics-mst/fu-self-test.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/plugins/synaptics-mst/fu-self-test.c b/plugins/synaptics-mst/fu-self-test.c +index ffdaa7a5b..29a05e9c5 100644 +--- a/plugins/synaptics-mst/fu-self-test.c ++++ b/plugins/synaptics-mst/fu-self-test.c +@@ -81,6 +81,11 @@ fu_plugin_synaptics_mst_none_func(void) + g_ptr_array_new_with_free_func((GDestroyNotify)g_object_unref); + g_autofree gchar *filename = NULL; + ++#if defined(__s390x__) ++ g_test_skip("Skipping HWID test on s390x due missing HwIDs"); ++ return; ++#endif ++ + ret = fu_context_load_quirks(ctx, FU_QUIRKS_LOAD_FLAG_NO_CACHE, &error); + g_assert_no_error(error); + g_assert_true(ret); +@@ -124,6 +129,11 @@ fu_plugin_synaptics_mst_tb16_func(void) + g_ptr_array_new_with_free_func((GDestroyNotify)g_object_unref); + g_autofree gchar *filename = NULL; + ++#if defined(__s390x__) ++ g_test_skip("Skipping HWID test on s390x due missing HwIDs"); ++ return; ++#endif ++ + ret = fu_context_load_quirks(ctx, FU_QUIRKS_LOAD_FLAG_NO_CACHE, &error); + g_assert_no_error(error); + g_assert_true(ret); +-- +2.37.3 + diff --git a/fwupd.spec b/fwupd.spec index 3d8e15e..83958a2 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -59,6 +59,8 @@ License: LGPLv2+ URL: https://github.com/fwupd/fwupd Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz +Patch0: 0001-trivial-Fix-the-tests-on-s390x.patch + BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libxmlb-devel >= %{libxmlb_version}