[PATCH v3 9/9] tests: Drop DO_TEST_LINUX()

[Andrea Bolognani <abologna@xxxxxxxxxx>]

Now that mocking NUMA information works on FreeBSD, there are
no longer any test cases that need to be restricted to Linux
only.

Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
 tests/qemuxml2argvtest.c | 46 +++++++++++++++-------------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5b3bd4a996..5d8aedb2c6 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -767,24 +767,6 @@ mymain(void)
                  FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \
                  parseFlags, GIC_NONE, __VA_ARGS__)
 
-# define DO_TEST_LINUX(name, ...) \
-    DO_TEST_LINUX_FULL(name, NULL, -1, 0, 0, GIC_NONE, __VA_ARGS__)
-
-# ifdef __linux__
-    /* This is a macro that invokes test only on Linux. It's
-     * meant to be called in those cases where qemuxml2argvmock
-     * cooperation is expected (e.g. we need a fixed time,
-     * predictable NUMA topology and so on). On non-Linux
-     * platforms the macro just consume its argument. */
-#  define DO_TEST_LINUX_FULL(name, ...) \
-    DO_TEST_FULL(name, __VA_ARGS__)
-# else  /* __linux__ */
-#  define DO_TEST_LINUX_FULL(name, ...) \
-    do { \
-        const char *tmp ATTRIBUTE_UNUSED = name; \
-    } while (0)
-# endif /* __linux__ */
-
 # define NONE QEMU_CAPS_LAST
 
     /* Unset or set all envvars here that are copied in qemudBuildCommandLine
@@ -935,16 +917,16 @@ mymain(void)
             QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_USB_REDIR,
             QEMU_CAPS_DEVICE_PC_DIMM,
             QEMU_CAPS_OBJECT_MEMORY_FILE);
-    DO_TEST_LINUX("hugepages-pages",
-                  QEMU_CAPS_OBJECT_MEMORY_RAM,
-                  QEMU_CAPS_OBJECT_MEMORY_FILE);
+    DO_TEST("hugepages-pages",
+            QEMU_CAPS_OBJECT_MEMORY_RAM,
+            QEMU_CAPS_OBJECT_MEMORY_FILE);
     DO_TEST("hugepages-pages2", QEMU_CAPS_OBJECT_MEMORY_RAM,
             QEMU_CAPS_OBJECT_MEMORY_FILE);
     DO_TEST("hugepages-pages3", QEMU_CAPS_OBJECT_MEMORY_RAM,
             QEMU_CAPS_OBJECT_MEMORY_FILE);
-    DO_TEST_LINUX("hugepages-shared",
-                  QEMU_CAPS_OBJECT_MEMORY_RAM,
-                  QEMU_CAPS_OBJECT_MEMORY_FILE);
+    DO_TEST("hugepages-shared",
+            QEMU_CAPS_OBJECT_MEMORY_RAM,
+            QEMU_CAPS_OBJECT_MEMORY_FILE);
     DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
     DO_TEST_FAILURE("hugepages-pages4",
             QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
@@ -1562,9 +1544,9 @@ mymain(void)
     DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, 0, GIC_NONE, NONE);
     DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, 0, GIC_NONE, NONE);
 
-    DO_TEST_LINUX_FULL("migrate-numa-unaligned", "stdio", 7, 0, 0, GIC_NONE,
-                       QEMU_CAPS_NUMA,
-                       QEMU_CAPS_OBJECT_MEMORY_RAM);
+    DO_TEST_FULL("migrate-numa-unaligned", "stdio", 7, 0, 0, GIC_NONE,
+                 QEMU_CAPS_NUMA,
+                 QEMU_CAPS_OBJECT_MEMORY_RAM);
 
     DO_TEST("qemu-ns", NONE);
     DO_TEST("qemu-ns-no-env", NONE);
@@ -1662,12 +1644,14 @@ mymain(void)
 
     DO_TEST("numatune-memory", NONE);
     DO_TEST_PARSE_ERROR("numatune-memory-invalid-nodeset", NONE);
-    DO_TEST_LINUX("numatune-memnode", QEMU_CAPS_NUMA,
-                  QEMU_CAPS_OBJECT_MEMORY_RAM);
+    DO_TEST("numatune-memnode",
+            QEMU_CAPS_NUMA,
+            QEMU_CAPS_OBJECT_MEMORY_RAM);
     DO_TEST_FAILURE("numatune-memnode", NONE);
 
-    DO_TEST_LINUX("numatune-memnode-no-memory", QEMU_CAPS_NUMA,
-                  QEMU_CAPS_OBJECT_MEMORY_RAM);
+    DO_TEST("numatune-memnode-no-memory",
+            QEMU_CAPS_NUMA,
+            QEMU_CAPS_OBJECT_MEMORY_RAM);
     DO_TEST_FAILURE("numatune-memnode-no-memory", NONE);
 
     DO_TEST("numatune-distances", QEMU_CAPS_NUMA, QEMU_CAPS_NUMA_DIST);
-- 
2.14.3

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list