mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 14:15:28 +00:00
b7b3fb56f5
qmeuargv2xmltest.c would fail any test that logged anything during qemuParseCommandline(), but then discard the log message, even with VIR_TEST_DEBUG=2. This patch outputs the log messages with fprintf(stderr,...) when debug logging is on. In the process of modifying that logic, the testInfo data was made more similar to that of qemuxml2argvtest.c - rather than turning info->extraFlags into a bool, an enum of flags is defined, the info struct is given an "unsigned int flags", and FLAG_EXPECT_WARNING is saved into info->flags, to be checked during the test; this will make it easier to add other FLAG_EXPECT_* items in the future.
313 lines
8.5 KiB
C
313 lines
8.5 KiB
C
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "testutils.h"
|
|
|
|
#ifdef WITH_QEMU
|
|
|
|
# include "internal.h"
|
|
# include "qemu/qemu_command.h"
|
|
# include "testutilsqemu.h"
|
|
# include "virstring.h"
|
|
|
|
# define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
static virQEMUDriver driver;
|
|
|
|
static int blankProblemElements(char *data)
|
|
{
|
|
if (virtTestClearLineRegex("<name>[[:alnum:]]+</name>", data) < 0 ||
|
|
virtTestClearLineRegex("<uuid>([[:alnum:]]|-)+</uuid>", data) < 0 ||
|
|
virtTestClearLineRegex("<memory.*>[[:digit:]]+</memory>", data) < 0 ||
|
|
virtTestClearLineRegex("<currentMemory.*>[[:digit:]]+</currentMemory>",
|
|
data) < 0 ||
|
|
virtTestClearLineRegex("<readonly/>", data) < 0 ||
|
|
virtTestClearLineRegex("<sharable/>", data) < 0)
|
|
return -1;
|
|
return 0;
|
|
}
|
|
|
|
typedef enum {
|
|
FLAG_EXPECT_WARNING = 1 << 0,
|
|
} virQemuXML2ArgvTestFlags;
|
|
|
|
static int testCompareXMLToArgvFiles(const char *xml,
|
|
const char *cmdfile,
|
|
virQemuXML2ArgvTestFlags flags)
|
|
{
|
|
char *expectxml = NULL;
|
|
char *actualxml = NULL;
|
|
char *cmd = NULL;
|
|
char *log = NULL;
|
|
int ret = -1;
|
|
virDomainDefPtr vmdef = NULL;
|
|
|
|
if (virtTestLoadFile(cmdfile, &cmd) < 0)
|
|
goto fail;
|
|
if (virtTestLoadFile(xml, &expectxml) < 0)
|
|
goto fail;
|
|
|
|
if (!(vmdef = qemuParseCommandLineString(driver.caps, driver.xmlopt,
|
|
cmd, NULL, NULL, NULL)))
|
|
goto fail;
|
|
|
|
if (!virtTestOOMActive()) {
|
|
if ((log = virtTestLogContentAndReset()) == NULL)
|
|
goto fail;
|
|
if (flags & FLAG_EXPECT_WARNING) {
|
|
if (*log) {
|
|
if (virTestGetDebug() > 1)
|
|
fprintf(stderr,
|
|
"Got expected warning from "
|
|
"qemuParseCommandLineString:\n%s",
|
|
log);
|
|
} else {
|
|
if (virTestGetDebug())
|
|
fprintf(stderr, "qemuParseCommandLineString "
|
|
"should have logged a warning\n");
|
|
goto fail;
|
|
}
|
|
} else { /* didn't expect a warning */
|
|
if (*log) {
|
|
if (virTestGetDebug())
|
|
fprintf(stderr,
|
|
"Got unexpected warning from "
|
|
"qemuParseCommandLineString:\n%s",
|
|
log);
|
|
goto fail;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!virDomainDefCheckABIStability(vmdef, vmdef)) {
|
|
fprintf(stderr, "ABI stability check failed on %s", xml);
|
|
goto fail;
|
|
}
|
|
|
|
if (!(actualxml = virDomainDefFormat(vmdef, 0)))
|
|
goto fail;
|
|
|
|
if (blankProblemElements(expectxml) < 0 ||
|
|
blankProblemElements(actualxml) < 0)
|
|
goto fail;
|
|
|
|
if (STRNEQ(expectxml, actualxml)) {
|
|
virtTestDifference(stderr, expectxml, actualxml);
|
|
goto fail;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
fail:
|
|
VIR_FREE(expectxml);
|
|
VIR_FREE(actualxml);
|
|
VIR_FREE(cmd);
|
|
VIR_FREE(log);
|
|
virDomainDefFree(vmdef);
|
|
return ret;
|
|
}
|
|
|
|
|
|
struct testInfo {
|
|
const char *name;
|
|
unsigned int flags;
|
|
};
|
|
|
|
static int
|
|
testCompareXMLToArgvHelper(const void *data)
|
|
{
|
|
int result = -1;
|
|
const struct testInfo *info = data;
|
|
char *xml = NULL;
|
|
char *args = NULL;
|
|
|
|
if (virAsprintf(&xml, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml",
|
|
abs_srcdir, info->name) < 0 ||
|
|
virAsprintf(&args, "%s/qemuxml2argvdata/qemuxml2argv-%s.args",
|
|
abs_srcdir, info->name) < 0)
|
|
goto cleanup;
|
|
|
|
result = testCompareXMLToArgvFiles(xml, args, info->flags);
|
|
|
|
cleanup:
|
|
VIR_FREE(xml);
|
|
VIR_FREE(args);
|
|
return result;
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
|
|
driver.config = virQEMUDriverConfigNew(false);
|
|
if (driver.config == NULL)
|
|
return EXIT_FAILURE;
|
|
|
|
if ((driver.caps = testQemuCapsInit()) == NULL)
|
|
return EXIT_FAILURE;
|
|
|
|
if (!(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver)))
|
|
return EXIT_FAILURE;
|
|
|
|
# define DO_TEST_FULL(name, flags) \
|
|
do { \
|
|
const struct testInfo info = { name, (flags) }; \
|
|
if (virtTestRun("QEMU ARGV-2-XML " name, \
|
|
testCompareXMLToArgvHelper, &info) < 0) \
|
|
ret = -1; \
|
|
} while (0)
|
|
|
|
# define DO_TEST(name) \
|
|
DO_TEST_FULL(name, 0)
|
|
|
|
setenv("PATH", "/bin", 1);
|
|
setenv("USER", "test", 1);
|
|
setenv("LOGNAME", "test", 1);
|
|
setenv("HOME", "/home/test", 1);
|
|
unsetenv("TMPDIR");
|
|
unsetenv("LD_PRELOAD");
|
|
unsetenv("LD_LIBRARY_PATH");
|
|
|
|
/* Can't roundtrip vcpu cpuset attribute */
|
|
/*DO_TEST("minimal", QEMU_CAPS_NAME);*/
|
|
DO_TEST("machine-core-on");
|
|
DO_TEST("machine-core-off");
|
|
DO_TEST("boot-cdrom");
|
|
DO_TEST("boot-network");
|
|
DO_TEST("boot-floppy");
|
|
DO_TEST("kvmclock");
|
|
/* This needs <emulator>./qemu.sh</emulator> which doesn't work here. */
|
|
/*DO_TEST("cpu-kvmclock");*/
|
|
|
|
/* Can't roundtrip xenner arch */
|
|
/*DO_TEST("bootloader");*/
|
|
|
|
DO_TEST("reboot-timeout-enabled");
|
|
DO_TEST("reboot-timeout-disabled");
|
|
|
|
DO_TEST("clock-utc");
|
|
DO_TEST("clock-localtime");
|
|
DO_TEST("disk-cdrom");
|
|
DO_TEST("disk-cdrom-empty");
|
|
DO_TEST("disk-floppy");
|
|
DO_TEST("disk-many");
|
|
DO_TEST("disk-virtio");
|
|
DO_TEST("disk-xenvbd");
|
|
DO_TEST("disk-drive-boot-disk");
|
|
DO_TEST("disk-drive-boot-cdrom");
|
|
DO_TEST("disk-drive-fmt-qcow");
|
|
/* Can't roundtrip shareable+cache mode option */
|
|
/*DO_TEST("disk-drive-shared");*/
|
|
/* Can't roundtrip v1 writethrough option */
|
|
/*DO_TEST("disk-drive-cache-v1-wt");*/
|
|
DO_TEST("disk-drive-cache-v1-wb");
|
|
DO_TEST("disk-drive-cache-v1-none");
|
|
DO_TEST("disk-drive-error-policy-stop");
|
|
DO_TEST("disk-drive-error-policy-enospace");
|
|
DO_TEST("disk-drive-error-policy-wreport-rignore");
|
|
DO_TEST("disk-drive-cache-v2-wt");
|
|
DO_TEST("disk-drive-cache-v2-wb");
|
|
DO_TEST("disk-drive-cache-v2-none");
|
|
DO_TEST("disk-drive-cache-directsync");
|
|
DO_TEST("disk-drive-cache-unsafe");
|
|
DO_TEST("disk-drive-network-nbd");
|
|
DO_TEST("disk-drive-network-nbd-export");
|
|
DO_TEST("disk-drive-network-nbd-ipv6");
|
|
DO_TEST("disk-drive-network-nbd-ipv6-export");
|
|
DO_TEST("disk-drive-network-nbd-unix");
|
|
DO_TEST("disk-drive-network-iscsi");
|
|
DO_TEST("disk-drive-network-gluster");
|
|
DO_TEST("disk-drive-network-rbd");
|
|
DO_TEST("disk-drive-network-rbd-ipv6");
|
|
/* older format using CEPH_ARGS env var */
|
|
DO_TEST("disk-drive-network-rbd-ceph-env");
|
|
DO_TEST("disk-drive-network-sheepdog");
|
|
DO_TEST("disk-usb");
|
|
DO_TEST("graphics-vnc");
|
|
DO_TEST("graphics-vnc-socket");
|
|
DO_TEST("graphics-vnc-websocket");
|
|
DO_TEST("graphics-vnc-policy");
|
|
|
|
DO_TEST("graphics-vnc-sasl");
|
|
DO_TEST("graphics-vnc-tls");
|
|
|
|
DO_TEST("graphics-sdl");
|
|
DO_TEST("graphics-sdl-fullscreen");
|
|
DO_TEST("nographics-vga");
|
|
DO_TEST("input-usbmouse");
|
|
DO_TEST("input-usbtablet");
|
|
/* Can't rountrip xenner arch */
|
|
/*DO_TEST("input-xen");*/
|
|
DO_TEST("misc-acpi");
|
|
DO_TEST("misc-disable-s3");
|
|
DO_TEST("misc-disable-suspends");
|
|
DO_TEST("misc-enable-s4");
|
|
DO_TEST("misc-no-reboot");
|
|
DO_TEST("misc-uuid");
|
|
DO_TEST("net-user");
|
|
DO_TEST("net-virtio");
|
|
DO_TEST("net-eth");
|
|
DO_TEST("net-eth-ifname");
|
|
|
|
DO_TEST("serial-vc");
|
|
DO_TEST("serial-pty");
|
|
DO_TEST("serial-dev");
|
|
DO_TEST("serial-file");
|
|
DO_TEST("serial-unix");
|
|
DO_TEST("serial-tcp");
|
|
DO_TEST("serial-udp");
|
|
DO_TEST("serial-tcp-telnet");
|
|
DO_TEST("serial-many");
|
|
DO_TEST("parallel-tcp");
|
|
DO_TEST("console-compat");
|
|
DO_TEST("sound");
|
|
DO_TEST("watchdog");
|
|
|
|
DO_TEST("hostdev-usb-address");
|
|
|
|
DO_TEST("hostdev-pci-address");
|
|
|
|
DO_TEST("smp");
|
|
|
|
DO_TEST("hyperv");
|
|
|
|
DO_TEST("pseries-nvram");
|
|
DO_TEST("pseries-disk");
|
|
|
|
DO_TEST("nosharepages");
|
|
|
|
DO_TEST("restore-v1");
|
|
DO_TEST("restore-v2");
|
|
DO_TEST("migrate");
|
|
|
|
DO_TEST_FULL("qemu-ns-no-env", FLAG_EXPECT_WARNING);
|
|
|
|
virObjectUnref(driver.config);
|
|
virObjectUnref(driver.caps);
|
|
virObjectUnref(driver.xmlopt);
|
|
|
|
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
}
|
|
|
|
VIRT_TEST_MAIN(mymain)
|
|
|
|
#else
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
return EXIT_AM_SKIP;
|
|
}
|
|
|
|
#endif /* WITH_QEMU */
|