From nobody Sun Apr 28 00:50:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1510925030817885.6411257836633; Fri, 17 Nov 2017 05:23:50 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 852E67F755; Fri, 17 Nov 2017 13:17:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1D39177B37; Fri, 17 Nov 2017 13:17:59 +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 DE7F93894; Fri, 17 Nov 2017 13:17:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vAHDHtPn016562 for ; Fri, 17 Nov 2017 08:17:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8743063F8F; Fri, 17 Nov 2017 13:17:55 +0000 (UTC) Received: from mx1.redhat.com (ext-mx06.extmail.prod.ext.phx2.redhat.com [10.5.110.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 81DC260562 for ; Fri, 17 Nov 2017 13:17:52 +0000 (UTC) Received: from relay.sw.ru (mailhub.sw.ru [195.214.232.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 29880356CC for ; Fri, 17 Nov 2017 13:17:51 +0000 (UTC) Received: from dim-vz7.qa.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id vAHDHm4V004177 for ; Fri, 17 Nov 2017 16:17:48 +0300 (MSK) From: Nikolay Shirokovskiy To: libvir-list@redhat.com Date: Fri, 17 Nov 2017 16:17:37 +0300 Message-Id: <1510924658-131025-2-git-send-email-nshirokovskiy@virtuozzo.com> In-Reply-To: <1510924658-131025-1-git-send-email-nshirokovskiy@virtuozzo.com> References: <1510924658-131025-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Greylist: Delayed for 22:12:54 by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 17 Nov 2017 13:17:51 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 17 Nov 2017 13:17:51 +0000 (UTC) for IP:'195.214.232.25' DOMAIN:'mailhub.sw.ru' HELO:'relay.sw.ru' FROM:'nshirokovskiy@virtuozzo.com' RCPT:'' X-RedHat-Spam-Score: -0.001 (SPF_PASS) 195.214.232.25 mailhub.sw.ru 195.214.232.25 mailhub.sw.ru X-Scanned-By: MIMEDefang 2.78 on 10.5.110.30 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] tests: commandtest: handle tcmalloc hacking environment 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 17 Nov 2017 13:18:00 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" If one of the libraries is compiled with tcmalloc then the latter will add GLIBCPP_FORCE_NEW and GLIBCXX_FORCE_NEW to environment at startup and thus break commandtest. --- tests/commandhelper.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 1da2834..0f6ce07 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -94,8 +94,15 @@ int main(int argc, char **argv) { for (i =3D 0; i < n; i++) { /* Ignore the variables used to instruct the loader into * behaving differently, as they could throw the tests off. */ - if (!STRPREFIX(newenv[i], "LD_")) - fprintf(log, "ENV:%s\n", newenv[i]); + if (STRPREFIX(newenv[i], "LD_")) + continue; + + /* Fix tests if tcmalloc is used in libraries */ + if (STRPREFIX(newenv[i], "GLIBCPP_FORCE_NEW=3D") || + STRPREFIX(newenv[i], "GLIBCXX_FORCE_NEW=3D")) + continue; + + fprintf(log, "ENV:%s\n", newenv[i]); } =20 open_max =3D sysconf(_SC_OPEN_MAX); --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 00:50:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1510925004094282.1158036695541; Fri, 17 Nov 2017 05:23:24 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C74A4C05689D; Fri, 17 Nov 2017 13:18:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 795EE60562; Fri, 17 Nov 2017 13:18:07 +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 2C2C33899; Fri, 17 Nov 2017 13:18:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vAHDHt4i016563 for ; Fri, 17 Nov 2017 08:17:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id 88E6560562; Fri, 17 Nov 2017 13:17:55 +0000 (UTC) Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 83B95620B3 for ; Fri, 17 Nov 2017 13:17:53 +0000 (UTC) Received: from relay.sw.ru (mailhub.sw.ru [195.214.232.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2BC851A4096 for ; Fri, 17 Nov 2017 13:17:51 +0000 (UTC) Received: from dim-vz7.qa.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id vAHDHm4W004177 for ; Fri, 17 Nov 2017 16:17:48 +0300 (MSK) From: Nikolay Shirokovskiy To: libvir-list@redhat.com Date: Fri, 17 Nov 2017 16:17:38 +0300 Message-Id: <1510924658-131025-3-git-send-email-nshirokovskiy@virtuozzo.com> In-Reply-To: <1510924658-131025-1-git-send-email-nshirokovskiy@virtuozzo.com> References: <1510924658-131025-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Greylist: Delayed for 22:12:54 by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 17 Nov 2017 13:17:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 17 Nov 2017 13:17:52 +0000 (UTC) for IP:'195.214.232.25' DOMAIN:'mailhub.sw.ru' HELO:'relay.sw.ru' FROM:'nshirokovskiy@virtuozzo.com' RCPT:'' X-RedHat-Spam-Score: -0.001 (SPF_PASS) 195.214.232.25 mailhub.sw.ru 195.214.232.25 mailhub.sw.ru X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] tests: fix typo 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 17 Nov 2017 13:18:08 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Reviewed-by: Daniel P. Berrange --- tests/commanddata/test10.log | 3 ++- tests/commanddata/test11.log | 3 ++- tests/commanddata/test12.log | 3 ++- tests/commanddata/test13.log | 3 ++- tests/commanddata/test14.log | 3 ++- tests/commanddata/test15.log | 3 ++- tests/commanddata/test2.log | 3 ++- tests/commanddata/test20.log | 3 ++- tests/commanddata/test21.log | 3 ++- tests/commanddata/test3.log | 3 ++- tests/commanddata/test4.log | 3 ++- tests/commanddata/test5.log | 3 ++- tests/commanddata/test7.log | 3 ++- tests/commanddata/test9.log | 3 ++- tests/commandtest.c | 2 +- 15 files changed, 29 insertions(+), 15 deletions(-) diff --git a/tests/commanddata/test10.log b/tests/commanddata/test10.log index 6b22786..6f0fdb5 100644 --- a/tests/commanddata/test10.log +++ b/tests/commanddata/test10.log @@ -4,8 +4,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test11.log b/tests/commanddata/test11.log index 6b22786..6f0fdb5 100644 --- a/tests/commanddata/test11.log +++ b/tests/commanddata/test11.log @@ -4,8 +4,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test12.log b/tests/commanddata/test12.log index 703e6da..bb3103c 100644 --- a/tests/commanddata/test12.log +++ b/tests/commanddata/test12.log @@ -2,8 +2,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test13.log b/tests/commanddata/test13.log index 703e6da..bb3103c 100644 --- a/tests/commanddata/test13.log +++ b/tests/commanddata/test13.log @@ -2,8 +2,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test14.log b/tests/commanddata/test14.log index 703e6da..bb3103c 100644 --- a/tests/commanddata/test14.log +++ b/tests/commanddata/test14.log @@ -2,8 +2,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test15.log b/tests/commanddata/test15.log index edb2fc3..f2b0d5e 100644 --- a/tests/commanddata/test15.log +++ b/tests/commanddata/test15.log @@ -2,8 +2,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test2.log b/tests/commanddata/test2.log index 703e6da..bb3103c 100644 --- a/tests/commanddata/test2.log +++ b/tests/commanddata/test2.log @@ -2,8 +2,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test20.log b/tests/commanddata/test20.log index a0475e6..0c14074 100644 --- a/tests/commanddata/test20.log +++ b/tests/commanddata/test20.log @@ -3,8 +3,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test21.log b/tests/commanddata/test21.log index 703e6da..bb3103c 100644 --- a/tests/commanddata/test21.log +++ b/tests/commanddata/test21.log @@ -2,8 +2,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test3.log b/tests/commanddata/test3.log index f44400b..cfa0979 100644 --- a/tests/commanddata/test3.log +++ b/tests/commanddata/test3.log @@ -2,8 +2,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test4.log b/tests/commanddata/test4.log index 6cd2095..f170be2 100644 --- a/tests/commanddata/test4.log +++ b/tests/commanddata/test4.log @@ -2,8 +2,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test5.log b/tests/commanddata/test5.log index f801dca..ae54189 100644 --- a/tests/commanddata/test5.log +++ b/tests/commanddata/test5.log @@ -1,7 +1,8 @@ ENV:HOME=3D/home/test ENV:LC_ALL=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test7.log b/tests/commanddata/test7.log index e30efe7..fb4a754 100644 --- a/tests/commanddata/test7.log +++ b/tests/commanddata/test7.log @@ -1,8 +1,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:LC_ALL=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commanddata/test9.log b/tests/commanddata/test9.log index e9e1611..d59d8f4 100644 --- a/tests/commanddata/test9.log +++ b/tests/commanddata/test9.log @@ -10,8 +10,9 @@ ENV:DISPLAY=3D:0.0 ENV:HOME=3D/home/test ENV:HOSTNAME=3Dtest ENV:LANG=3DC -ENV:LOGNAME=3DtestTMPDIR=3D/tmp +ENV:LOGNAME=3Dtest ENV:PATH=3D/usr/bin:/bin +ENV:TMPDIR=3D/tmp ENV:USER=3Dtest FD:0 FD:1 diff --git a/tests/commandtest.c b/tests/commandtest.c index 1aa3e45..ad81c2a 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -843,7 +843,7 @@ static const char *const newenv[] =3D { "LANG=3DC", "HOME=3D/home/test", "USER=3Dtest", - "LOGNAME=3Dtest" + "LOGNAME=3Dtest", "TMPDIR=3D/tmp", "DISPLAY=3D:0.0", NULL --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list