8:38 a.m.
Technically for the LXC capabilities lookup we don't have another test
case, but given that it shares the implementation with qemu and thus the
only thing we are missing out on is testing of filling of the fake
capabilities which doesn't make sense testing.
Remove vircapstest.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/meson.build | 14 -----
tests/vircapstest.c | 130 --------------------------------------------
2 files changed, 144 deletions(-)
delete mode 100644 tests/vircapstest.c
diff --git a/tests/meson.build b/tests/meson.build
index 6be806f4ae..11010ebc6c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -249,19 +249,6 @@ if conf.has('WITH_QEMU')
domaincapstest_link_whole += [ test_utils_qemu_lib ]
endif
-vircapstest_link_with = []
-vircapstest_link_whole = []
-vircapstest_sources = [ 'vircapstest.c' ]
-if conf.has('WITH_LXC')
- vircapstest_link_with += [ lxc_driver_impl_lib ]
- vircapstest_link_whole += [ test_utils_lxc_lib ]
-endif
-if conf.has('WITH_QEMU')
- vircapstest_link_with += [ qemu_driver_impl ]
- vircapstest_link_whole += [ test_utils_qemu_lib ]
- vircapstest_sources += [ qemu_dtrace_gen_objects ]
-endif
-
tests += [
{ 'name': 'commandtest' },
{ 'name': 'cputest', 'link_with': cputest_link_with,
'link_whole': cputest_link_whole },
@@ -285,7 +272,6 @@ tests += [
{ 'name': 'virauthconfigtest' },
{ 'name': 'virbitmaptest' },
{ 'name': 'virbuftest' },
- { 'name': 'vircapstest', 'sources': vircapstest_sources,
'link_with': vircapstest_link_with, 'link_whole': vircapstest_link_whole
},
{ 'name': 'vircgrouptest' },
{ 'name': 'virconftest' },
{ 'name': 'vircryptotest' },
diff --git a/tests/vircapstest.c b/tests/vircapstest.c
deleted file mode 100644
index 2101d35198..0000000000
--- a/tests/vircapstest.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) IBM Corp 2014
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- *
- */
-
-#include <config.h>
-
-#include "testutils.h"
-#include "testutilslxc.h"
-#include "capabilities.h"
-
-
-#define VIR_FROM_THIS VIR_FROM_NONE
-
-
-static bool G_GNUC_UNUSED
-doCapsCompare(virCaps *caps,
- int ostype,
- virArch arch,
- int domaintype,
- const char *emulator,
- const char *machinetype,
- int expect_ostype,
- virArch expect_arch,
- int expect_domaintype,
- const char *expect_emulator,
- const char *expect_machinetype)
-{
- bool ret = false;
- virCapsDomainData *data = virCapabilitiesDomainDataLookup(caps, ostype,
- arch, domaintype, emulator, machinetype);
-
- if (!data)
- goto error;
-
- if (data->ostype != expect_ostype) {
- fprintf(stderr, "data->ostype=%s doesn't match
expect_ostype=%s\n",
- virDomainOSTypeToString(data->ostype),
- virDomainOSTypeToString(expect_ostype));
- goto error;
- }
-
- if (data->arch != expect_arch) {
- fprintf(stderr, "data->arch=%s doesn't match expect_arch=%s\n",
- virArchToString(data->arch),
- virArchToString(expect_arch));
- goto error;
- }
-
- if (data->domaintype != expect_domaintype) {
- fprintf(stderr, "data->domaintype=%s doesn't match "
- "expect_domaintype=%s\n",
- virDomainVirtTypeToString(data->domaintype),
- virDomainVirtTypeToString(expect_domaintype));
- goto error;
- }
-
- if (STRNEQ(data->emulator, expect_emulator)) {
- fprintf(stderr, "data->emulator=%s doesn't match
expect_emulator=%s\n",
- data->emulator, expect_emulator);
- goto error;
- }
-
- if (STRNEQ_NULLABLE(data->machinetype, expect_machinetype)) {
- fprintf(stderr, "data->machinetype=%s doesn't match "
- "expect_machinetype=%s\n",
- NULLSTR(data->machinetype), NULLSTR(expect_machinetype));
- goto error;
- }
-
- ret = true;
- error:
- VIR_FREE(data);
- return ret;
-}
-
-#define CAPSCOMP(o, a, d, e, m, fo, fa, fd, fe, fm) \
- if (!doCapsCompare(caps, o, a, d, e, m, fo, fa, fd, fe, fm)) \
- ret = -1;
-
-#ifdef WITH_LXC
-static int
-test_virCapsDomainDataLookupLXC(const void *data G_GNUC_UNUSED)
-{
- int ret = 0;
- g_autoptr(virCaps) caps = NULL;
-
- if (!(caps = testLXCCapsInit()))
- return -1;
-
- CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, NULL,
- VIR_DOMAIN_OSTYPE_EXE, VIR_ARCH_X86_64,
- VIR_DOMAIN_VIRT_LXC, "/usr/libexec/libvirt_lxc", NULL);
- CAPSCOMP(-1, VIR_ARCH_X86_64, VIR_DOMAIN_VIRT_NONE, NULL, NULL,
- VIR_DOMAIN_OSTYPE_EXE, VIR_ARCH_X86_64,
- VIR_DOMAIN_VIRT_LXC, "/usr/libexec/libvirt_lxc", NULL);
-
- return ret;
-}
-#endif /* WITH_LXC */
-
-static int
-mymain(void)
-{
- int ret = 0;
-
-#ifdef WITH_LXC
- if (virTestRun("virCapsDomainDataLookupLXC",
- test_virCapsDomainDataLookupLXC, NULL) < 0)
- ret = -1;
-#endif /* WITH_LXC */
-
- return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-VIR_TEST_MAIN(mymain)
--
2.39.2