From nobody Sun Feb 8 18:43:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596473945; cv=none; d=zohomail.com; s=zohoarc; b=P7p1GKT9rNovnNMSIH4koStycvSf0oLNmNVblgSjGGfC095rA436J1jGP9nf3vg35Eb5wbwJATRIjuV3zhO12FFKKzF2E3qwsSGjzQrkyv1ZY1z3oITGnArnpco83NeFcfqwCcIKGTaf+hvqxY42W2UvKgm8xqJtxPXCchIAgH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596473945; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=43+Kg3syygzCcE7Yp/zPtQzTjY/cmIzbDRgOzLI8t7s=; b=BeIpaWvFhQgVDTCaRKXlpL9pg+FjPfc7SSInBDE1uSv4GLKe4ZnEXxqjsHRNzDjjUwO967NMOT0is42DAW8+XZ3lrkliBhTu6v2xqb+NrZs/YboI1GON0Xd324BgaYkAZ+MbPl1YAg43uRvAUIHrwvgpQagP+VAg5Nr6zk84v9E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 159647394554496.67109347255268; Mon, 3 Aug 2020 09:59:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-20-bA2Qcwb6POe-LiVdzKX1gQ-1; Mon, 03 Aug 2020 12:57:44 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 32AF7101C8A6; Mon, 3 Aug 2020 16:57:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0F4E45DA74; Mon, 3 Aug 2020 16:57:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CFFD41800C9A; Mon, 3 Aug 2020 16:57:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 073Gvasa007899 for ; Mon, 3 Aug 2020 12:57:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id BB9DC7177A; Mon, 3 Aug 2020 16:57:36 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13B2771778 for ; Mon, 3 Aug 2020 16:57:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596473944; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=43+Kg3syygzCcE7Yp/zPtQzTjY/cmIzbDRgOzLI8t7s=; b=Ks0nVjOVXXremGw8OBLnPMHmFSf1ZEtwAhWJJPRxK66YoVG6JxzxcTDaTXPEqtaJCZwIeL WnpRtoqKW7YQ5nXSqagWnfwjrIIEsjVRfvZJuja6r/dzlAkxquycOr0WMuDi4HuSii0Cxb KbjWcI81RX1txR84QCuxVaAsZhN2Hpw= X-MC-Unique: bA2Qcwb6POe-LiVdzKX1gQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH RFC 18/19] tests: use VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT Date: Mon, 3 Aug 2020 18:56:55 +0200 Message-Id: <8908ce196516a2ac56dcce07d5ba1f40b4254e5a.1596473604.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Some test rely too much on declaring variables in the middle of the function. Use the macro to locally suppress the warning Signed-off-by: J=C3=A1n Tomko --- tests/domaincapstest.c | 2 ++ tests/virnetsockettest.c | 2 ++ tests/virnettlscontexttest.c | 3 +++ tests/virnettlssessiontest.c | 3 +++ tests/virstoragetest.c | 2 ++ tests/virstringtest.c | 4 ++++ tests/viruritest.c | 2 ++ 7 files changed, 18 insertions(+) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index c3a9f4ef91..1c3acdcd25 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -287,6 +287,7 @@ doTestQemuInternal(const char *version, capsName =3D g_strdup_printf("caps_%s", version); emulator =3D g_strdup_printf("/usr/bin/qemu-system-%s", arch); =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT struct testData data =3D { .name =3D name, .emulator =3D emulator, @@ -297,6 +298,7 @@ doTestQemuInternal(const char *version, .capsName =3D capsName, .capsOpaque =3D opaque, }; + VIR_WARNINGS_RESET =20 if (virTestRun(name, test_virDomainCapsFormat, &data) < 0) return -1; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 96c582216c..7d2ad36aae 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -572,6 +572,7 @@ mymain(void) if (virTestRun("Socket External Command /dev/does-not-exist", testSock= etCommandFail, NULL) < 0) ret =3D -1; =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT struct testSSHData sshData1 =3D { .nodename =3D "somehost", .path =3D "/tmp/socket", @@ -675,6 +676,7 @@ mymain(void) "fi;" "'''\\''/tmp/fo o/nc'\\'''' $ARG -U /tmp/socket'\n", }; + VIR_WARNINGS_RESET if (virTestRun("SSH test 7", testSocketSSH, &sshData7) < 0) ret =3D -1; =20 diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 6d970d0ea8..9860e0ec3e 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -136,6 +136,7 @@ mymain(void) }; \ testTLSGenerateCert(&varname, cavarname.crt) =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT # define TLS_ROOT_REQ(varname, \ co, cn, an1, an2, ia1, ia2, bce, bcc, bci, \ kue, kuc, kuv, kpe, kpc, kpo1, kpo2, so, eo) \ @@ -563,6 +564,8 @@ mymain(void) certchain, G_N_ELEMENTS(certchain)); =20 + VIR_WARNINGS_RESET + DO_CTX_TEST(true, "cacertchain-ctx.pem", servercertlevel3areq.filename= , false); DO_CTX_TEST(false, "cacertchain-ctx.pem", clientcertlevel2breq.filenam= e, false); =20 diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 6807581d70..ebb90ad5a2 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -277,6 +277,7 @@ mymain(void) ret =3D -1; \ } while (0) =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT # define TLS_CERT_REQ(varname, cavarname, \ co, cn, an1, an2, ia1, ia2, bce, bcc, bci, \ kue, kuc, kuv, kpe, kpc, kpo1, kpo2, so, eo) \ @@ -460,6 +461,8 @@ mymain(void) DO_SESS_TEST("cacertchain-sess.pem", servercertlevel3areq.filename, cl= ientcertlevel2breq.filename, false, false, "libvirt.org", NULL); =20 + VIR_WARNINGS_RESET + testTLSDiscardCert(&clientcertreq); testTLSDiscardCert(&clientcertaltreq); =20 diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 98f47f0e41..179ae5e5e7 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -682,6 +682,7 @@ mymain(void) /* Missing file */ TEST_ONE_CHAIN("bogus", VIR_STORAGE_FILE_RAW, EXP_FAIL); =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT /* Raw image, whether with right format or no specified format */ testFileData raw =3D { .path =3D absraw, @@ -963,6 +964,7 @@ mymain(void) }; TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2, &rbd2), EXP_PASS= ); =20 + VIR_WARNINGS_RESET =20 /* Rewrite wrap and qcow2 back to 3-deep chain, absolute backing */ virCommandFree(cmd); diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 8b8d2acced..704686ac10 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -691,6 +691,7 @@ mymain(void) ret =3D -1; \ } while (0) =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT const char *tokens1[] =3D { NULL }; TEST_SPLIT("", " ", 0, tokens1); =20 @@ -714,6 +715,7 @@ mymain(void) =20 const char *tokens8[] =3D { "gluster", "rdma", NULL }; TEST_SPLIT("gluster+rdma", "+", 2, tokens8); + VIR_WARNINGS_RESET =20 if (virTestRun("virStringSortCompare", testStringSortCompare, NULL) < = 0) ret =3D -1; @@ -741,6 +743,7 @@ mymain(void) /* None matching */ TEST_SEARCH("foo", "(bar)", 10, 0, NULL, false); =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT /* Full match */ const char *matches1[] =3D { "foo" }; TEST_SEARCH("foo", "(foo)", 10, 1, matches1, false); @@ -752,6 +755,7 @@ mymain(void) /* Multi matches, limited returns */ const char *matches3[] =3D { "foo", "bar" }; TEST_SEARCH("1foo2bar3eek", "([a-z]+)", 2, 2, matches3, false); + VIR_WARNINGS_RESET =20 #define TEST_MATCH(s, r, m) \ do { \ diff --git a/tests/viruritest.c b/tests/viruritest.c index 0edf3e5522..587498bc2b 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -166,6 +166,7 @@ mymain(void) *query_out ? "test://example.com/?" query_out : NULL, \ "test", "example.com", 0, "/", query_in, NULL, NULL, params) =20 + VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT virURIParam params[] =3D { { (char*)"name", (char*)"value", false }, { NULL, NULL, false }, @@ -216,6 +217,7 @@ mymain(void) { (char*)"foo", (char*)"one", false }, { NULL, NULL, false }, }; + VIR_WARNINGS_RESET =20 TEST_PARAMS("foo=3Done&bar=3Dtwo", "", params1); TEST_PARAMS("foo=3Done&foo=3Dtwo", "", params2); --=20 2.26.2