From: Michal Privoznik <mprivozn@redhat.com>

Inside of tests/meson.build there is a section that builds QEMU
related tests conditionally (for instance
qemudomaincheckpointxml2xmltest). It makes no sense to have the
same check inside source file. Or even provide alternative
implementation for cases when building without QEMU
(EXIT_AM_SKIP). When building without QEMU driver the test is not
even compiled, so EXIT_AM_SKIP is dead code.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 tests/qemudomaincheckpointxml2xmltest.c |  31 ++-----
 tests/qemudomainsnapshotxml2xmltest.c   |  29 ++----
 tests/qemumemlocktest.c                 |  25 ++----
 tests/qemuxmlconftest.c                 | 114 +++++++++++-------------
 tests/testutilsqemu.c                   |  43 +++++----
 tests/testutilsqemu.h                   |  23 +++--
 6 files changed, 104 insertions(+), 161 deletions(-)

diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c
index 0e195dae8d..e6d9bf1a4f 100644
--- a/tests/qemudomaincheckpointxml2xmltest.c
+++ b/tests/qemudomaincheckpointxml2xmltest.c
@@ -9,15 +9,12 @@
 #include <fcntl.h>
 
 #include "testutils.h"
+#include "internal.h"
+#include "qemu/qemu_conf.h"
+#include "checkpoint_conf.h"
+#include "testutilsqemu.h"
 
-#ifdef WITH_QEMU
-
-# include "internal.h"
-# include "qemu/qemu_conf.h"
-# include "checkpoint_conf.h"
-# include "testutilsqemu.h"
-
-# define VIR_FROM_THIS VIR_FROM_NONE
+#define VIR_FROM_THIS VIR_FROM_NONE
 
 static virQEMUDriver driver;
 
@@ -145,7 +142,7 @@ mymain(void)
     virDomainXMLOptionSetMomentPostParse(driver.xmlopt,
                                          testCheckpointPostParse);
 
-# define DO_TEST(prefix, name, inpath, outpath, time, flags) \
+#define DO_TEST(prefix, name, inpath, outpath, time, flags) \
     do { \
         const struct testInfo info = {abs_srcdir "/" inpath "/" name ".xml", \
                                       abs_srcdir "/" outpath "/" name ".xml", \
@@ -155,17 +152,17 @@ mymain(void)
             ret = -1; \
     } while (0)
 
-# define DO_TEST_INOUT(name, time, flags) \
+#define DO_TEST_INOUT(name, time, flags) \
     DO_TEST("in->out", name, \
             "qemudomaincheckpointxml2xmlin", \
             "qemudomaincheckpointxml2xmlout", \
             time, flags)
-# define DO_TEST_OUT(name, flags) \
+#define DO_TEST_OUT(name, flags) \
     DO_TEST("out->out", name, \
             "qemudomaincheckpointxml2xmlout", \
             "qemudomaincheckpointxml2xmlout", \
             0, flags | TEST_REDEFINE)
-# define DO_TEST_INVALID(name) \
+#define DO_TEST_INVALID(name) \
     DO_TEST("in->out", name, \
             "qemudomaincheckpointxml2xmlin", \
             "qemudomaincheckpointxml2xmlout", \
@@ -196,13 +193,3 @@ mymain(void)
 }
 
 VIR_TEST_MAIN(mymain)
-
-#else
-
-int
-main(void)
-{
-    return EXIT_AM_SKIP;
-}
-
-#endif /* WITH_QEMU */
diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxml2xmltest.c
index 035c275b14..9b9168ac21 100644
--- a/tests/qemudomainsnapshotxml2xmltest.c
+++ b/tests/qemudomainsnapshotxml2xmltest.c
@@ -6,14 +6,11 @@
 #include <fcntl.h>
 
 #include "testutils.h"
+#include "internal.h"
+#include "qemu/qemu_conf.h"
+#include "testutilsqemu.h"
 
-#ifdef WITH_QEMU
-
-# include "internal.h"
-# include "qemu/qemu_conf.h"
-# include "testutilsqemu.h"
-
-# define VIR_FROM_THIS VIR_FROM_NONE
+#define VIR_FROM_THIS VIR_FROM_NONE
 
 static virQEMUDriver driver;
 
@@ -123,7 +120,7 @@ mymain(void)
     virDomainXMLOptionSetMomentPostParse(driver.xmlopt,
                                          testSnapshotPostParse);
 
-# define DO_TEST(prefix, name, inpath, outpath, uuid, time, flags) \
+#define DO_TEST(prefix, name, inpath, outpath, uuid, time, flags) \
     do { \
         const struct testInfo info = {abs_srcdir "/" inpath "/" name ".xml", \
                                       abs_srcdir "/" outpath "/" name ".xml", \
@@ -133,16 +130,16 @@ mymain(void)
             ret = -1; \
     } while (0)
 
-# define DO_TEST_IN(name, uuid) DO_TEST("in->in", name, \
+#define DO_TEST_IN(name, uuid) DO_TEST("in->in", name, \
                                         "qemudomainsnapshotxml2xmlin", \
                                         "qemudomainsnapshotxml2xmlin", \
                                         uuid, 0, 0)
 
-# define DO_TEST_OUT(name, uuid, internal) \
+#define DO_TEST_OUT(name, uuid, internal) \
     DO_TEST("out->out", name, "qemudomainsnapshotxml2xmlout", \
             "qemudomainsnapshotxml2xmlout", uuid, 0, internal | TEST_REDEFINE)
 
-# define DO_TEST_INOUT(name, uuid, time, flags) \
+#define DO_TEST_INOUT(name, uuid, time, flags) \
     DO_TEST("in->out", name, \
             "qemudomainsnapshotxml2xmlin",\
             "qemudomainsnapshotxml2xmlout",\
@@ -190,13 +187,3 @@ mymain(void)
 }
 
 VIR_TEST_MAIN(mymain)
-
-#else
-
-int
-main(void)
-{
-    return EXIT_AM_SKIP;
-}
-
-#endif /* WITH_QEMU */
diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c
index a2888732f7..0f22594ad4 100644
--- a/tests/qemumemlocktest.c
+++ b/tests/qemumemlocktest.c
@@ -6,16 +6,13 @@
 #include <fcntl.h>
 
 #include "testutils.h"
+#include "internal.h"
+#include "conf/domain_conf.h"
+#include "qemu/qemu_domain.h"
 
-#ifdef WITH_QEMU
+#include "testutilsqemu.h"
 
-# include "internal.h"
-# include "conf/domain_conf.h"
-# include "qemu/qemu_domain.h"
-
-# include "testutilsqemu.h"
-
-# define VIR_FROM_THIS VIR_FROM_QEMU
+#define VIR_FROM_THIS VIR_FROM_QEMU
 
 static virQEMUDriver driver;
 
@@ -52,7 +49,7 @@ mymain(void)
     if (qemuTestDriverInit(&driver) < 0)
         return EXIT_FAILURE;
 
-# define DO_TEST(name, memlock) \
+#define DO_TEST(name, memlock) \
     do { \
         static struct testInfo info = { \
             name, memlock \
@@ -127,13 +124,3 @@ mymain(void)
 VIR_TEST_MAIN_PRELOAD(mymain,
                       VIR_TEST_MOCK("virpci"),
                       VIR_TEST_MOCK("domaincaps"))
-
-#else
-
-int
-main(void)
-{
-    return EXIT_AM_SKIP;
-}
-
-#endif /* WITH_QEMU */
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 187f90c9dc..cf147e70d4 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -6,33 +6,30 @@
 #include <fcntl.h>
 
 #include "testutils.h"
+#include "internal.h"
+#include "viralloc.h"
+#include "viridentity.h"
+#include "qemu/qemu_block.h"
+#include "qemu/qemu_capabilities.h"
+#include "qemu/qemu_domain.h"
+#include "qemu/qemu_migration.h"
+#include "qemu/qemu_passt.h"
+#include "qemu/qemu_process.h"
+#include "qemu/qemu_slirp.h"
+#include "qemu/qemu_virtiofs.h"
+#include "qemu/qemu_vhost_user.h"
+#include "datatypes.h"
+#include "conf/storage_conf.h"
+#include "virfilewrapper.h"
+#include "configmake.h"
+#include "testutilsqemuschema.h"
 
-#ifdef WITH_QEMU
+#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
+#include "qemu/qemu_capspriv.h"
 
-# include "internal.h"
-# include "viralloc.h"
-# include "viridentity.h"
-# include "qemu/qemu_block.h"
-# include "qemu/qemu_capabilities.h"
-# include "qemu/qemu_domain.h"
-# include "qemu/qemu_migration.h"
-# include "qemu/qemu_passt.h"
-# include "qemu/qemu_process.h"
-# include "qemu/qemu_slirp.h"
-# include "qemu/qemu_virtiofs.h"
-# include "qemu/qemu_vhost_user.h"
-# include "datatypes.h"
-# include "conf/storage_conf.h"
-# include "virfilewrapper.h"
-# include "configmake.h"
-# include "testutilsqemuschema.h"
+#include "testutilsqemu.h"
 
-# define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
-# include "qemu/qemu_capspriv.h"
-
-# include "testutilsqemu.h"
-
-# define VIR_FROM_THIS VIR_FROM_QEMU
+#define VIR_FROM_THIS VIR_FROM_QEMU
 
 static virQEMUDriver driver;
 
@@ -95,7 +92,7 @@ static virSecretDriver fakeSecretDriver = {
 };
 
 
-# define STORAGE_POOL_XML_PATH "storagepoolxml2xmlout/"
+#define STORAGE_POOL_XML_PATH "storagepoolxml2xmlout/"
 static const unsigned char fakeUUID[VIR_UUID_BUFLEN] = "fakeuuid";
 
 static virStoragePoolPtr
@@ -743,7 +740,7 @@ testQemuConfXMLCommon(testQemuInfo *info,
     if (testInfoCheckDuplicate(info) < 0)
         goto cleanup;
 
-# if !WITH_NBDKIT
+#if !WITH_NBDKIT
     /* when compiled without nbdkit support we want to skip the test after
      * marking it as used */
     if (info->args.fakeNbdkitCaps) {
@@ -751,7 +748,7 @@ testQemuConfXMLCommon(testQemuInfo *info,
         info->prepared = true;
         goto cleanup;
     }
-# endif /* !WITH_NBDKIT */
+#endif /* !WITH_NBDKIT */
 
     if (info->arch != VIR_ARCH_NONE && info->arch != VIR_ARCH_X86_64)
         qemuTestSetHostArch(&driver, info->arch);
@@ -1302,64 +1299,64 @@ mymain(void)
  * the test cases should be forked using DO_TEST_CAPS_VER with the appropriate
  * version.
  */
-# define DO_TEST_FULL(_name, _suffix, ...) \
+#define DO_TEST_FULL(_name, _suffix, ...) \
     testRun(_name, _suffix, &ret, &testConf, __VA_ARGS__);
 
-# define DO_TEST_CAPS_INTERNAL(name, arch, ver, ...) \
+#define DO_TEST_CAPS_INTERNAL(name, arch, ver, ...) \
     DO_TEST_FULL(name, "." arch "-" ver, \
                  ARG_CAPS_ARCH, arch, \
                  ARG_CAPS_VER, ver, \
                  __VA_ARGS__, \
                  ARG_END)
 
-# define DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ...) \
+#define DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ...) \
     DO_TEST_CAPS_INTERNAL(name, arch, "latest", __VA_ARGS__)
 
-# define DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, ...) \
+#define DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, ...) \
     DO_TEST_CAPS_INTERNAL(name, arch, ver, __VA_ARGS__)
 
-# define DO_TEST_CAPS_ARCH_LATEST(name, arch) \
+#define DO_TEST_CAPS_ARCH_LATEST(name, arch) \
     DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ARG_END)
 
-# define DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE(name, arch) \
+#define DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE(name, arch) \
     DO_TEST_FULL(name, "." arch "-latest.abi-update", \
                  ARG_CAPS_ARCH, arch, \
                  ARG_CAPS_VER, "latest", \
                  ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, \
                  ARG_END)
 
-# define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \
+#define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \
     DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, ARG_END)
 
-# define DO_TEST_CAPS_LATEST_NBDKIT(name, ...) \
+#define DO_TEST_CAPS_LATEST_NBDKIT(name, ...) \
     DO_TEST_CAPS_ARCH_LATEST_FULL(name, "x86_64", ARG_NBDKIT_CAPS, __VA_ARGS__, QEMU_NBDKIT_CAPS_LAST, ARG_END)
 
-# define DO_TEST_CAPS_LATEST(name) \
+#define DO_TEST_CAPS_LATEST(name) \
     DO_TEST_CAPS_ARCH_LATEST(name, "x86_64")
 
-# define DO_TEST_CAPS_LATEST_ABI_UPDATE(name) \
+#define DO_TEST_CAPS_LATEST_ABI_UPDATE(name) \
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE(name, "x86_64")
 
-# define DO_TEST_CAPS_VER(name, ver) \
+#define DO_TEST_CAPS_VER(name, ver) \
     DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver)
 
-# define DO_TEST_CAPS_LATEST_PPC64(name) \
+#define DO_TEST_CAPS_LATEST_PPC64(name) \
     DO_TEST_CAPS_ARCH_LATEST(name, "ppc64")
 
-# define DO_TEST_CAPS_LATEST_PPC64_HOSTCPU(name, hostcpu) \
+#define DO_TEST_CAPS_LATEST_PPC64_HOSTCPU(name, hostcpu) \
     DO_TEST_CAPS_ARCH_LATEST_FULL(name, "ppc64", \
                                   ARG_CAPS_HOST_CPU_MODEL, hostcpu)
 
-# define DO_TEST_CAPS_LATEST_PPC64_HOSTCPU_FAILURE(name, hostcpu) \
+#define DO_TEST_CAPS_LATEST_PPC64_HOSTCPU_FAILURE(name, hostcpu) \
     DO_TEST_CAPS_ARCH_LATEST_FULL(name, "ppc64", \
                                   ARG_CAPS_HOST_CPU_MODEL, hostcpu, \
                                   ARG_FLAGS, FLAG_EXPECT_FAILURE)
 
-# define DO_TEST_CAPS_ARCH_LATEST_FAILURE(name, arch) \
+#define DO_TEST_CAPS_ARCH_LATEST_FAILURE(name, arch) \
     DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \
                                   ARG_FLAGS, FLAG_EXPECT_FAILURE)
 
-# define DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_FAILURE(name, arch) \
+#define DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_FAILURE(name, arch) \
     DO_TEST_FULL(name, "." arch "-latest.abi-update", \
                  ARG_CAPS_ARCH, arch, \
                  ARG_CAPS_VER, "latest", \
@@ -1367,24 +1364,24 @@ mymain(void)
                  ARG_FLAGS, FLAG_EXPECT_FAILURE, \
                  ARG_END)
 
-# define DO_TEST_CAPS_ARCH_VER_FAILURE(name, arch, ver) \
+#define DO_TEST_CAPS_ARCH_VER_FAILURE(name, arch, ver) \
     DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, \
                                ARG_FLAGS, FLAG_EXPECT_FAILURE)
 
-# define DO_TEST_CAPS_LATEST_FAILURE(name) \
+#define DO_TEST_CAPS_LATEST_FAILURE(name) \
     DO_TEST_CAPS_ARCH_LATEST_FAILURE(name, "x86_64")
 
-# define DO_TEST_CAPS_LATEST_ABI_UPDATE_FAILURE(name) \
+#define DO_TEST_CAPS_LATEST_ABI_UPDATE_FAILURE(name) \
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_FAILURE(name, "x86_64")
 
-# define DO_TEST_CAPS_VER_FAILURE(name, ver) \
+#define DO_TEST_CAPS_VER_FAILURE(name, ver) \
     DO_TEST_CAPS_ARCH_VER_FAILURE(name, "x86_64", ver)
 
-# define DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR(name, arch) \
+#define DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR(name, arch) \
     DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, \
                                   ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR)
 
-# define DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_PARSE_ERROR(name, arch) \
+#define DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_PARSE_ERROR(name, arch) \
     DO_TEST_FULL(name, "." arch "-latest.abi-update", \
                  ARG_CAPS_ARCH, arch, \
                  ARG_CAPS_VER, "latest", \
@@ -1392,20 +1389,20 @@ mymain(void)
                  ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR, \
                  ARG_END)
 
-# define DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, arch, ver) \
+#define DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, arch, ver) \
     DO_TEST_CAPS_ARCH_VER_FULL(name, arch, ver, \
                                ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR)
 
-# define DO_TEST_CAPS_LATEST_PARSE_ERROR(name) \
+#define DO_TEST_CAPS_LATEST_PARSE_ERROR(name) \
     DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR(name, "x86_64")
 
-# define DO_TEST_CAPS_LATEST_ABI_UPDATE_PARSE_ERROR(name) \
+#define DO_TEST_CAPS_LATEST_ABI_UPDATE_PARSE_ERROR(name) \
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE_PARSE_ERROR(name, "x86_64")
 
-# define DO_TEST_CAPS_VER_PARSE_ERROR(name, ver) \
+#define DO_TEST_CAPS_VER_PARSE_ERROR(name, ver) \
     DO_TEST_CAPS_ARCH_VER_PARSE_ERROR(name, "x86_64", ver)
 
-# define DO_TEST_GIC(name, ver, gic) \
+#define DO_TEST_GIC(name, ver, gic) \
     DO_TEST_CAPS_ARCH_VER_FULL(name, "aarch64", ver, ARG_GIC, gic, ARG_FLAGS, FLAG_ALLOW_DUPLICATE_OUTPUT, ARG_END)
 
     /* Unset or set all envvars here that are copied in qemudBuildCommandLine
@@ -3418,12 +3415,3 @@ VIR_TEST_MAIN_PRELOAD(mymain,
                       VIR_TEST_MOCK("virrandom"),
                       VIR_TEST_MOCK("qemucpu"),
                       VIR_TEST_MOCK("virnuma"))
-
-#else
-
-int main(void)
-{
-    return EXIT_AM_SKIP;
-}
-
-#endif /* WITH_QEMU */
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index d7f2e55330..e00e52d2a8 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -1,23 +1,22 @@
 #include <config.h>
-#ifdef WITH_QEMU
 
-# include "testutilsqemu.h"
-# include "testutilsqemuschema.h"
-# include "testutilshostcpus.h"
-# include "testutils.h"
-# include "viralloc.h"
-# include "cpu_conf.h"
-# include "qemu/qemu_domain.h"
-# define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
-# include "qemu/qemu_capspriv.h"
-# include "virstring.h"
-# include "virfilecache.h"
-# include "virtpm.h"
+#include <sys/types.h>
+#include <fcntl.h>
 
-# include <sys/types.h>
-# include <fcntl.h>
+#include "testutilsqemu.h"
+#include "testutilsqemuschema.h"
+#include "testutilshostcpus.h"
+#include "testutils.h"
+#include "viralloc.h"
+#include "cpu_conf.h"
+#include "qemu/qemu_domain.h"
+#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
+#include "qemu/qemu_capspriv.h"
+#include "virstring.h"
+#include "virfilecache.h"
+#include "virtpm.h"
 
-# define VIR_FROM_THIS VIR_FROM_QEMU
+#define VIR_FROM_THIS VIR_FROM_QEMU
 
 static virCPUDef *cpuDefault;
 static virCPUDef *cpuHaswell;
@@ -289,8 +288,8 @@ qemuTestCapsCacheInsert(virFileCache *cache,
     return 0;
 }
 
-# define STATEDIRTEMPLATE abs_builddir "/qemustatedir-XXXXXX"
-# define CONFIGDIRTEMPLATE abs_builddir "/qemuconfigdir-XXXXXX"
+#define STATEDIRTEMPLATE abs_builddir "/qemustatedir-XXXXXX"
+#define CONFIGDIRTEMPLATE abs_builddir "/qemuconfigdir-XXXXXX"
 
 int qemuTestDriverInit(virQEMUDriver *driver)
 {
@@ -443,8 +442,8 @@ testQemuCapsSetGIC(virQEMUCaps *qemuCaps,
 
     gicCapabilities = g_new0(virGICCapability, 2);
 
-# define IMPL_BOTH \
-         VIR_GIC_IMPLEMENTATION_KERNEL|VIR_GIC_IMPLEMENTATION_EMULATED
+#define IMPL_BOTH \
+    VIR_GIC_IMPLEMENTATION_KERNEL|VIR_GIC_IMPLEMENTATION_EMULATED
 
     if (gic & GIC_V2) {
         gicCapabilities[ngicCapabilities].version = VIR_GIC_VERSION_2;
@@ -457,7 +456,7 @@ testQemuCapsSetGIC(virQEMUCaps *qemuCaps,
         ngicCapabilities++;
     }
 
-# undef IMPL_BOTH
+#undef IMPL_BOTH
 
     virQEMUCapsSetGICCapabilities(qemuCaps,
                                   gicCapabilities, ngicCapabilities);
@@ -465,8 +464,6 @@ testQemuCapsSetGIC(virQEMUCaps *qemuCaps,
     return 0;
 }
 
-#endif
-
 
 struct testQemuCapsFile {
     unsigned long long ver;
diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
index a8e0fefa84..dbc8e2dbdf 100644
--- a/tests/testutilsqemu.h
+++ b/tests/testutilsqemu.h
@@ -16,19 +16,17 @@
 
 #pragma once
 
-#ifdef WITH_QEMU
+#include "capabilities.h"
+#include "virfilecache.h"
+#include "domain_conf.h"
+#include "qemu/qemu_capabilities.h"
+#include "qemu/qemu_conf.h"
 
-# include "capabilities.h"
-# include "virfilecache.h"
-# include "domain_conf.h"
-# include "qemu/qemu_capabilities.h"
-# include "qemu/qemu_conf.h"
-
-# define TEST_QEMU_CAPS_PATH abs_srcdir "/qemucapabilitiesdata"
-# define TEST_TPM_ENV_VAR "VIR_TEST_MOCK_FAKE_TPM_VERSION"
-# define TPM_VER_1_2 "1.2"
-# define TPM_VER_2_0 "2.0"
-# define TEST_NBDKIT_PATH "/fakebindir/nbdkit"
+#define TEST_QEMU_CAPS_PATH abs_srcdir "/qemucapabilitiesdata"
+#define TEST_TPM_ENV_VAR "VIR_TEST_MOCK_FAKE_TPM_VERSION"
+#define TPM_VER_1_2 "1.2"
+#define TPM_VER_2_0 "2.0"
+#define TEST_NBDKIT_PATH "/fakebindir/nbdkit"
 
 enum {
     GIC_NONE = 0,
@@ -187,4 +185,3 @@ testQemuInsertRealCaps(virFileCache *cache,
                        GHashTable *capsCache,
                        GHashTable *schemaCache,
                        GHashTable **schema);
-#endif
-- 
2.52.0