From b4072bd6457db1f299d31820b66da0a5c703117f Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Nov 13 2019 21:33:52 +0000
Subject: Fix the test suite


Signed-off-by: Cole Robinson <crobinso@redhat.com>

---

diff --git a/0001-tests-fix-modules-test-duplicate-test-case-error.patch b/0001-tests-fix-modules-test-duplicate-test-case-error.patch
new file mode 100644
index 0000000..7c8f385
--- /dev/null
+++ b/0001-tests-fix-modules-test-duplicate-test-case-error.patch
@@ -0,0 +1,40 @@
+From d64c9aa098cc6e5c0b638438c4959eddfa7e24e2 Mon Sep 17 00:00:00 2001
+Message-Id: <d64c9aa098cc6e5c0b638438c4959eddfa7e24e2.1573679311.git.crobinso@redhat.com>
+From: Cole Robinson <crobinso@redhat.com>
+Date: Wed, 13 Nov 2019 16:05:11 -0500
+Subject: [PATCH] tests: fix modules-test 'duplicate test case' error
+
+./configure --enable-sdl --audio-drv-list=sdl --enable-modules
+
+Will generate two identical test names: /$arch/module/load/sdl
+Which generates an error like:
+
+(tests/modules-test:23814): GLib-ERROR **: 18:23:06.359: duplicate test case path: /aarch64//module/load/sdl
+
+Add the subsystem prefix in the name as well, so instead we get:
+
+/$arch/module/load/audio-sdl
+/$arch/module/load/ui-sdl
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ tests/modules-test.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/modules-test.c b/tests/modules-test.c
+index d1a6ace218..88217686e1 100644
+--- a/tests/modules-test.c
++++ b/tests/modules-test.c
+@@ -64,7 +64,8 @@ int main(int argc, char *argv[])
+     g_test_init(&argc, &argv, NULL);
+ 
+     for (i = 0; i < G_N_ELEMENTS(modules); i += 2) {
+-        char *testname = g_strdup_printf("/module/load/%s", modules[i + 1]);
++        char *testname = g_strdup_printf("/module/load/%s%s",
++                                         modules[i], modules[i + 1]);
+         qtest_add_data_func(testname, modules + i, test_modules_load);
+         g_free(testname);
+     }
+-- 
+2.23.0
+
diff --git a/qemu.spec b/qemu.spec
index ec9981a..66edf53 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -157,6 +157,9 @@ URL: http://www.qemu.org/
 
 Source0: http://wiki.qemu-project.org/download/%{name}-%{version}%{?rcstr}.tar.xz
 
+# Fix a test suite error
+Patch1: 0001-tests-fix-modules-test-duplicate-test-case-error.patch
+
 # guest agent service
 Source10: qemu-guest-agent.service
 Source17: qemu-ga.sysconfig