[libvirt PATCHv2 0/2] tests: switch to g_new0 (glib chronicles)
This time actually compile-tested. Ján Tomko (2): tests: build SELinux tests tests: use g_new0 instead of VIR_ALLOC_N tests/commandtest.c | 7 +++---- tests/domaincapstest.c | 3 +-- tests/fdstreamtest.c | 10 ++++------ tests/meson.build | 2 +- tests/qemuxml2argvtest.c | 3 +-- tests/securityselinuxlabeltest.c | 3 +-- tests/securityselinuxtest.c | 3 +-- tests/testutils.c | 8 ++------ tests/testutilsqemu.c | 6 ++---- tests/vircgrouptest.c | 3 +-- tests/vircryptotest.c | 5 ++--- tests/virhostcputest.c | 3 +-- tests/virnetmessagetest.c | 6 ++---- tests/virnetsockettest.c | 6 +----- tests/virnettlshelpers.c | 3 +-- tests/virstringtest.c | 3 +-- tests/xlconfigtest.c | 3 +-- tests/xmconfigtest.c | 3 +-- 18 files changed, 27 insertions(+), 53 deletions(-) -- 2.26.2
We set WITH_LIBATTR in meson.build, not WITH_ATTR. Signed-off-by: Ján Tomko <jtomko@redhat.com> Fixes: 3ace72965c3b11fc763f781ae7ce3ca29dd36507 --- tests/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 31e8d66c7a..eaf6628fb9 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -477,7 +477,7 @@ if conf.has('WITH_REMOTE') endif if conf.has('WITH_SECDRIVER_SELINUX') - if conf.has('WITH_ATTR') + if conf.has('WITH_LIBATTR') tests += [ { 'name': 'securityselinuxtest' }, { 'name': 'viridentitytest' }, -- 2.26.2
On Wed, Sep 23, 2020 at 15:39:49 +0200, Ján Tomko wrote:
We set WITH_LIBATTR in meson.build, not WITH_ATTR.
Signed-off-by: Ján Tomko <jtomko@redhat.com> Fixes: 3ace72965c3b11fc763f781ae7ce3ca29dd36507 --- tests/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
I got: [1010/1047] Linking target tests/securityselinuxlabeltest FAILED: tests/securityselinuxlabeltest cc -o tests/securityselinuxlabeltest src/libvirt_probes.o tests/securityselinuxlabeltest.p/securityselinuxlabeltest.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-export-dynamic -pie -Wl,--whole-archive -Wl,--start-group tests/libtest_utils.a tests/libtest_utils_qemu.a -Wl,--no-whole-archive src/libvirt.so.0.6008.0 -Wl,--no-copy-dt-needed-entries -Wl,-export-dynamic -ldl /usr/lib64/libglib-2.0.so /usr/lib64/libgobject-2.0.so /usr/lib64/libgio-2.0.so /usr/lib64/libgnutls.so /usr/lib64/libnl-3.so /usr/lib64/libnl-route-3.so /usr/lib64/libxml2.so /usr/lib64/libsasl2.so -lselinux /usr/lib64/libtirpc.so /usr/lib64/libyajl.so -Wl,-export-dynamic -lselinux -Wl,-export-dynamic -lselinux -Wl,--end-group '-Wl,-rpath,$ORIGIN/../src' -Wl,-rpath-link,/home/pipo/build/libvirt/gcc/src /bin/ld: tests/securityselinuxlabeltest.p/securityselinuxlabeltest.c.o: in function `mymain': /home/pipo/build/libvirt/gcc/../../../libvirt/tests/securityselinuxlabeltest.c:349: undefined reference to `virQEMUCapsNew' /bin/ld: /home/pipo/build/libvirt/gcc/../../../libvirt/tests/securityselinuxlabeltest.c:352: undefined reference to `virQEMUCapsSet' /bin/ld: /home/pipo/build/libvirt/gcc/../../../libvirt/tests/securityselinuxlabeltest.c:353: undefined reference to `virQEMUCapsSet' /bin/ld: tests/libtest_utils_qemu.a(testutilsqemu.c.o): in function `qemuTestParseCapabilitiesArch': /home/pipo/build/libvirt/gcc/../../../libvirt/tests/testutilsqemu.c:292: undefined reference to `virQEMUCapsNewBinary' /bin/ld: /home/pipo/build/libvirt/gcc/../../../libvirt/tests/testutilsqemu.c:293: undefined reference to `virQEMUCapsLoadCache' /bin/ld: tests/libtest_utils_qemu.a(testutilsqemu.c.o): in function `qemuTestCapsCacheInsert': /home/pipo/build/libvirt/gcc/../../../libvirt/tests/testutilsqemu.c:328: undefined reference to `virQEMUCapsNewCopy' /bin/ld: /home/pipo/build/libvirt/gcc/../../../libvirt/tests/testutilsqemu.c:333: undefined reference to `virQEMUCapsHasMachines' /bin/ld: /home/pipo/build/libvirt/gcc/../../../libvirt/tests/testutilsqemu.c:330: undefined reference to `virQEMUCapsNew' after applying this patch.
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- tests/commandtest.c | 7 +++---- tests/domaincapstest.c | 3 +-- tests/fdstreamtest.c | 10 ++++------ tests/qemuxml2argvtest.c | 3 +-- tests/securityselinuxlabeltest.c | 3 +-- tests/securityselinuxtest.c | 3 +-- tests/testutils.c | 8 ++------ tests/testutilsqemu.c | 6 ++---- tests/vircgrouptest.c | 3 +-- tests/vircryptotest.c | 5 ++--- tests/virhostcputest.c | 3 +-- tests/virnetmessagetest.c | 6 ++---- tests/virnetsockettest.c | 6 +----- tests/virnettlshelpers.c | 3 +-- tests/virstringtest.c | 3 +-- tests/xlconfigtest.c | 3 +-- tests/xmconfigtest.c | 3 +-- 17 files changed, 26 insertions(+), 52 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index cbbcda4e5f..df86725f0e 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1057,10 +1057,9 @@ static int test27(const void *unused G_GNUC_UNUSED) "%s%s%s" \ "END STDERR\n" - if (VIR_ALLOC_N(buffer0, buflen) < 0 || - VIR_ALLOC_N(buffer1, buflen) < 0 || - VIR_ALLOC_N(buffer2, buflen) < 0) - goto cleanup; + buffer0 = g_new0(char, buflen); + buffer1 = g_new0(char, buflen); + buffer2 = g_new0(char, buflen); memset(buffer0, 'H', buflen - 2); buffer0[buflen - 2] = '\n'; diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index f817ed5452..7a082705c6 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -147,8 +147,7 @@ fillXenCaps(virDomainCapsPtr domCaps) virFirmwarePtr *firmwares; int ret = -1; - if (VIR_ALLOC_N(firmwares, 2) < 0) - return ret; + firmwares = g_new0(virFirmwarePtr, 2); firmwares[0] = g_new0(virFirmware, 1); firmwares[1] = g_new0(virFirmware, 1); diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 83973137e7..7a2fe27477 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -54,9 +54,8 @@ static int testFDStreamReadCommon(const char *scratchdir, bool blocking) if (!(conn = virConnectOpen("test:///default"))) goto cleanup; - if (VIR_ALLOC_N(pattern, PATTERN_LEN) < 0 || - VIR_ALLOC_N(buf, PATTERN_LEN) < 0) - goto cleanup; + pattern = g_new0(char, PATTERN_LEN); + buf = g_new0(char, PATTERN_LEN); for (i = 0; i < PATTERN_LEN; i++) pattern[i] = i; @@ -185,9 +184,8 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) if (!(conn = virConnectOpen("test:///default"))) goto cleanup; - if (VIR_ALLOC_N(pattern, PATTERN_LEN) < 0 || - VIR_ALLOC_N(buf, PATTERN_LEN) < 0) - goto cleanup; + pattern = g_new0(char, PATTERN_LEN); + buf = g_new0(char, PATTERN_LEN); for (i = 0; i < PATTERN_LEN; i++) pattern[i] = i; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e93948e3fc..463e4c003d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -753,8 +753,7 @@ mymain(void) driver.config->nbdTLSx509certdir = g_strdup("/etc/pki/libvirt-nbd/dummy,path"); VIR_FREE(driver.config->hugetlbfs); - if (VIR_ALLOC_N(driver.config->hugetlbfs, 2) < 0) - return EXIT_FAILURE; + driver.config->hugetlbfs = g_new0(virHugeTLBFS, 2); driver.config->nhugetlbfs = 2; driver.config->hugetlbfs[0].mnt_dir = g_strdup("/dev/hugepages2M"); driver.config->hugetlbfs[1].mnt_dir = g_strdup("/dev/hugepages1G"); diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 2989a668b7..168acc2bdf 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -114,8 +114,7 @@ testSELinuxLoadFileList(const char *testname, if (!(fp = fopen(path, "r"))) goto cleanup; - if (VIR_ALLOC_N(line, 1024) < 0) - goto cleanup; + line = g_new0(char, 1024); while (!feof(fp)) { char *file = NULL, *context = NULL, *tmp; diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 297cc0e53d..a75ff495eb 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -71,8 +71,7 @@ testBuildDomainDef(bool dynamic, goto error; def->virtType = VIR_DOMAIN_VIRT_KVM; - if (VIR_ALLOC_N(def->seclabels, 1) < 0) - goto error; + def->seclabels = g_new0(virSecurityLabelDefPtr, 1); secdef = g_new0(virSecurityLabelDef, 1); diff --git a/tests/testutils.c b/tests/testutils.c index 3f53f635fc..b747f65eea 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -211,10 +211,7 @@ virTestLoadFile(const char *file, char **buf) tmplen = buflen = st.st_size + 1; - if (VIR_ALLOC_N(*buf, buflen) < 0) { - VIR_FORCE_FCLOSE(fp); - return -1; - } + *buf = g_new0(char, buflen); tmp = *buf; (*buf)[0] = '\0'; @@ -977,8 +974,7 @@ virTestCapsBuildNUMATopology(int seq) id = 0; for (cell_id = 0; cell_id < MAX_CELLS; cell_id++) { - if (VIR_ALLOC_N(cell_cpus, MAX_CPUS_IN_CELL) < 0) - goto error; + cell_cpus = g_new0(virCapsHostNUMACellCPU, MAX_CPUS_IN_CELL); for (core_id = 0; core_id < MAX_CPUS_IN_CELL; core_id++) { cell_cpus[core_id].id = id + core_id; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 51ac59bade..eb37bbfdad 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -204,8 +204,7 @@ virCapsPtr testQemuCapsInit(void) /* Add dummy 'none' security_driver. This is equal to setting * security_driver = "none" in qemu.conf. */ - if (VIR_ALLOC_N(caps->host.secModels, 1) < 0) - goto cleanup; + caps->host.secModels = g_new0(virCapsHostSecModel, 1); caps->host.nsecModels = 1; caps->host.secModels[0].model = g_strdup("none"); @@ -459,8 +458,7 @@ testQemuCapsSetGIC(virQEMUCapsPtr qemuCaps, virGICCapability *gicCapabilities = NULL; size_t ngicCapabilities = 0; - if (VIR_ALLOC_N(gicCapabilities, 2) < 0) - return -1; + gicCapabilities = g_new0(virGICCapability, 2); # define IMPL_BOTH \ VIR_GIC_IMPLEMENTATION_KERNEL|VIR_GIC_IMPLEMENTATION_EMULATED diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 44e72cbfa9..e5be556104 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -708,8 +708,7 @@ static int testCgroupGetPercpuStats(const void *args G_GNUC_UNUSED) 635751356ULL, 0, 0, 0, 0, 0, 0, 0, }; - if (VIR_ALLOC_N(params, EXPECTED_NCPUS) < 0) - goto cleanup; + params = g_new0(virTypedParameter, EXPECTED_NCPUS); if ((rv = virCgroupNewPartition("/virtualmachines", true, (1 << VIR_CGROUP_CONTROLLER_CPU) | diff --git a/tests/vircryptotest.c b/tests/vircryptotest.c index 42ef0b8900..90140077cf 100644 --- a/tests/vircryptotest.c +++ b/tests/vircryptotest.c @@ -83,9 +83,8 @@ testCryptoEncrypt(const void *opaque) return EXIT_AM_SKIP; } - if (VIR_ALLOC_N(enckey, enckeylen) < 0 || - VIR_ALLOC_N(iv, ivlen) < 0) - goto cleanup; + enckey = g_new0(uint8_t, enckeylen); + iv = g_new0(uint8_t, ivlen); if (virRandomBytes(enckey, enckeylen) < 0 || virRandomBytes(iv, ivlen) < 0) { diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 7b83c7ae5d..786a363e48 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -124,8 +124,7 @@ linuxCPUStatsCompareFiles(const char *cpustatfile, if (virHostCPUGetStatsLinux(NULL, 0, NULL, &nparams) < 0) goto fail; - if (VIR_ALLOC_N(params, nparams) < 0) - goto fail; + params = g_new0(virNodeCPUStats, nparams); if (virHostCPUGetStatsLinux(cpustat, VIR_NODE_CPU_STATS_ALL_CPUS, params, &nparams) < 0) diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index 76cc3d182f..9f6115f226 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -102,8 +102,7 @@ static int testMessageHeaderDecode(const void *args G_GNUC_UNUSED) return -1; msg->bufferLength = 4; - if (VIR_ALLOC_N(msg->buffer, msg->bufferLength) < 0) - goto cleanup; + msg->buffer = g_new0(char, msg->bufferLength); memcpy(msg->buffer, input_buf, msg->bufferLength); msg->header.prog = 0x11223344; @@ -332,8 +331,7 @@ static int testMessagePayloadDecode(const void *args G_GNUC_UNUSED) return -1; msg->bufferLength = 4; - if (VIR_ALLOC_N(msg->buffer, msg->bufferLength) < 0) - goto cleanup; + msg->buffer = g_new0(char, msg->bufferLength); memcpy(msg->buffer, input_buffer, msg->bufferLength); if (virNetMessageDecodeLength(msg) < 0) { diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index d6b461cbc8..5216b98424 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -206,11 +206,7 @@ testSocketAccept(const void *opaque) if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &usock) < 0) goto cleanup; - if (VIR_ALLOC_N(lsock, 1) < 0) { - virObjectUnref(usock); - goto cleanup; - } - + lsock = g_new0(virNetSocketPtr, 1); lsock[0] = usock; nlsock = 1; diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c index e0a4771894..ce38571b0a 100644 --- a/tests/virnettlshelpers.c +++ b/tests/virnettlshelpers.c @@ -117,8 +117,7 @@ static void testTLSDerEncode(ASN1_TYPE src, size = 0; asn1_der_coding(src, src_name, NULL, &size, NULL); - if (VIR_ALLOC_N(data, size) < 0) - abort(); + data = g_new0(char, size); asn1_der_coding(src, src_name, data, &size, NULL); diff --git a/tests/virstringtest.c b/tests/virstringtest.c index b2ef57c338..7305190691 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -555,8 +555,7 @@ testVirStringListFreeCount(const void *opaque G_GNUC_UNUSED) { char **list; - if (VIR_ALLOC_N(list, 4) < 0) - return -1; + list = g_new0(char *, 4); list[0] = g_strdup("test1"); list[2] = g_strdup("test2"); diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 3ad66ccfa1..ab1a834f1b 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -73,8 +73,7 @@ testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars) virDomainDefPtr def = NULL; char *replacedXML = NULL; - if (VIR_ALLOC_N(gotxlcfgData, wrote) < 0) - goto fail; + gotxlcfgData = g_new0(char, wrote); conn = virGetConnect(); if (!conn) goto fail; diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 43949fe3b5..8d6b2378fd 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -46,8 +46,7 @@ testCompareParseXML(const char *xmcfg, const char *xml) int wrote = 4096; virDomainDefPtr def = NULL; - if (VIR_ALLOC_N(gotxmcfgData, wrote) < 0) - goto fail; + gotxmcfgData = g_new0(char, wrote); conn = virGetConnect(); if (!conn) goto fail; -- 2.26.2
participants (2)
-
Ján Tomko -
Peter Krempa