From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 3 Jun 2019 11:15:19 +0000 (+0200)
Subject: qemuargv2xmltest: Use mocked virQEMUCapsProbeHostCPU
X-Git-Tag: v5.5.0-rc1~352
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02c1d3a6e1d24a777254f4dceeaf54942db7f871;p=thirdparty%2Flibvirt.git

qemuargv2xmltest: Use mocked virQEMUCapsProbeHostCPU

The qemuTestParseCapabilitiesArch call would eventually lead to the host
CPU being probed via virCPUGetHost. Let's divert this to a mocked
version already used by the qemuxml2argvtest.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 67375b3c19..6b17d99501 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -585,7 +585,8 @@ qemuxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS)
 qemuargv2xmltest_SOURCES = \
 	qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \
 	testutils.c testutils.h
-qemuargv2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS)
+qemuargv2xmltest_LDADD = libqemutestdriver.la \
+	$(LDADDS)
 
 qemumonitorjsontest_SOURCES = \
 	qemumonitorjsontest.c \
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 2a51e22318..06e32898a2 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -309,7 +309,8 @@ mymain(void)
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIR_TEST_MAIN(mymain)
+VIR_TEST_MAIN_PRELOAD(mymain,
+                      abs_builddir "/.libs/qemucpumock.so")
 
 #else