From nobody Sat Feb 7 09:15:43 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552495915411255.30681662073005; Wed, 13 Mar 2019 09:51:55 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B4724DCA04; Wed, 13 Mar 2019 16:51:53 +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 890025C22D; Wed, 13 Mar 2019 16:51:53 +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 3C10A181A13E; Wed, 13 Mar 2019 16:51:53 +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 x2DGpV1H013372 for ; Wed, 13 Mar 2019 12:51:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7BD035D73F; Wed, 13 Mar 2019 16:51:31 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F31395D706 for ; Wed, 13 Mar 2019 16:51:30 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 17:51:16 +0100 Message-Id: <20190313165123.23324-2-abologna@redhat.com> In-Reply-To: <20190313165123.23324-1-abologna@redhat.com> References: <20190313165123.23324-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/8] tests: Drop CONFIG_HEADER from TESTS_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: , 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 13 Mar 2019 16:51:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" It's no longer used as of commit a9694a8e183e. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- tests/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a7f1b39a5e..52a64c9eb1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -486,7 +486,6 @@ TESTS_ENVIRONMENT =3D \ abs_top_srcdir=3D`cd '$(top_srcdir)'; pwd` \ abs_builddir=3D$(abs_builddir) \ abs_srcdir=3D$(abs_srcdir) \ - CONFIG_HEADER=3D"$(lv_abs_top_builddir)/config.h" \ SHELL=3D"$(SHELL)" \ LIBVIRT_DRIVER_DIR=3D"$(lv_abs_top_builddir)/src/.libs" \ LIBVIRT_AUTOSTART=3D0 \ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Feb 7 09:15:43 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552495898306778.5072434061686; Wed, 13 Mar 2019 09:51:38 -0700 (PDT) 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 A07B5E1EF4; Wed, 13 Mar 2019 16:51:36 +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 0AAD0601AE; Wed, 13 Mar 2019 16:51:36 +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 7F1EB41F3C; Wed, 13 Mar 2019 16:51:35 +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 x2DGpW78013377 for ; Wed, 13 Mar 2019 12:51:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 534F95D73F; Wed, 13 Mar 2019 16:51:32 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB5FC5D706 for ; Wed, 13 Mar 2019 16:51:31 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 17:51:17 +0100 Message-Id: <20190313165123.23324-3-abologna@redhat.com> In-Reply-To: <20190313165123.23324-1-abologna@redhat.com> References: <20190313165123.23324-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/8] tests: Drop LIBVIRT_DRIVER_DIR from TESTS_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: , 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.38]); Wed, 13 Mar 2019 16:51:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" LIBVIRT_DRIVER_DIR is defined as (what is for all intents and purposes equivalent to) "$(abs_top_builddir)/src/.libs"; however, as of commit bc6e206322ae, virDriverLoadModule() will search that directory automatically, which means passing it through the environment is no longer necessary. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- tests/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 52a64c9eb1..adbe2f3d5e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -487,7 +487,6 @@ TESTS_ENVIRONMENT =3D \ abs_builddir=3D$(abs_builddir) \ abs_srcdir=3D$(abs_srcdir) \ SHELL=3D"$(SHELL)" \ - LIBVIRT_DRIVER_DIR=3D"$(lv_abs_top_builddir)/src/.libs" \ LIBVIRT_AUTOSTART=3D0 \ LC_ALL=3DC \ VIR_TEST_EXPENSIVE=3D$(VIR_TEST_EXPENSIVE) \ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Feb 7 09:15:43 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552495919057355.6060397172182; Wed, 13 Mar 2019 09:51:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 68FD42DD22; Wed, 13 Mar 2019 16:51:57 +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 33DD51001E7B; Wed, 13 Mar 2019 16:51:57 +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 DA4693FB12; Wed, 13 Mar 2019 16:51:56 +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 x2DGpXlI013391 for ; Wed, 13 Mar 2019 12:51:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2AC8C5D73F; Wed, 13 Mar 2019 16:51:33 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A2FFD5D706 for ; Wed, 13 Mar 2019 16:51:32 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 17:51:18 +0100 Message-Id: <20190313165123.23324-4-abologna@redhat.com> In-Reply-To: <20190313165123.23324-1-abologna@redhat.com> References: <20190313165123.23324-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/8] tests: Don't use TEST_DRIVER_DIR in virTestCaptureProgramExecChild() 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 13 Mar 2019 16:51:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" TEST_DRIVER_DIR is defined as "$(top_builddir)/src/.libs"; however, as of commit bc6e206322ae, virDriverLoadModule() will search (the absolute version of) that directory automatically, which means passing it through the environment is no longer necessary. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- tests/testutils.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index d2aa4e5d49..245b1832f6 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -443,7 +443,6 @@ void virTestCaptureProgramExecChild(const char *const a= rgv[], int stdinfd =3D -1; const char *const env[] =3D { "LANG=3DC", - "LIBVIRT_DRIVER_DIR=3D" TEST_DRIVER_DIR, NULL }; =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Feb 7 09:15:43 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552495922487978.2361286771528; Wed, 13 Mar 2019 09:52:02 -0700 (PDT) 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 C70783092663; Wed, 13 Mar 2019 16:52:00 +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 A2F5A5DD84; Wed, 13 Mar 2019 16:52:00 +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 663323FB15; Wed, 13 Mar 2019 16:52:00 +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 x2DGpYmS013398 for ; Wed, 13 Mar 2019 12:51:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0142C5D73F; Wed, 13 Mar 2019 16:51:34 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7A71D5D706 for ; Wed, 13 Mar 2019 16:51:33 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 17:51:19 +0100 Message-Id: <20190313165123.23324-5-abologna@redhat.com> In-Reply-To: <20190313165123.23324-1-abologna@redhat.com> References: <20190313165123.23324-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/8] tests: Don't define TEST_DRIVER_DIR 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: , 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.43]); Wed, 13 Mar 2019 16:52:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" It's no longer used anywhere. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- tests/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index adbe2f3d5e..237336d648 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -63,9 +63,6 @@ DRIVERLIB_LDFLAGS =3D \ -rpath /evil/libtool/hack/to/force/shared/lib/creation \ $(MINGW_EXTRA_LDFLAGS) =20 -AM_CPPFLAGS +=3D \ - -DTEST_DRIVER_DIR=3D\"$(top_builddir)/src/.libs\" - PROBES_O =3D if WITH_DTRACE_PROBES PROBES_O +=3D ../src/libvirt_probes.lo --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Feb 7 09:15:43 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552495901157303.97947907113485; Wed, 13 Mar 2019 09:51:41 -0700 (PDT) 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 52B33F95F5; Wed, 13 Mar 2019 16:51: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 25CF960634; Wed, 13 Mar 2019 16:51: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 D1F2E181A138; Wed, 13 Mar 2019 16:51: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 x2DGpY8g013403 for ; Wed, 13 Mar 2019 12:51:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id CD9905D73F; Wed, 13 Mar 2019 16:51:34 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5137F5D706 for ; Wed, 13 Mar 2019 16:51:34 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 17:51:20 +0100 Message-Id: <20190313165123.23324-6-abologna@redhat.com> In-Reply-To: <20190313165123.23324-1-abologna@redhat.com> References: <20190313165123.23324-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/8] tests: Stop looking for abs_top_srcdir in the 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: , 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.38]); Wed, 13 Mar 2019 16:51:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This code snippet has clearly been cargo-culted, and all its instances can be safely dropped seeing as 1) a much better way to handle the scenario in C programs would be to pass the value via the preprocessor, and 2) the value is actually not used anywhere after being defined. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- tests/libxlxml2domconfigtest.c | 5 ----- tests/networkxml2firewalltest.c | 6 ------ tests/nwfilterxml2firewalltest.c | 6 ------ tests/qemumemlocktest.c | 5 ----- tests/qemuxml2argvtest.c | 5 ----- tests/virscsitest.c | 5 ----- 6 files changed, 32 deletions(-) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index 863d8cded5..a96422b3f9 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -41,7 +41,6 @@ =20 # define VIR_FROM_THIS VIR_FROM_LIBXL =20 -static const char *abs_top_srcdir; static virCapsPtr caps; =20 static int @@ -172,10 +171,6 @@ mymain(void) { int ret =3D 0; =20 - abs_top_srcdir =3D getenv("abs_top_srcdir"); - if (!abs_top_srcdir) - abs_top_srcdir =3D abs_srcdir "/.."; - /* Set the timezone because we are mocking the time() function. * If we don't do that, then localtime() may return unpredictable * results. In order to detect things that just work by a blind diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index 91bb6e6b8a..575b68379a 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -36,8 +36,6 @@ =20 # define VIR_FROM_THIS VIR_FROM_NONE =20 -static const char *abs_top_srcdir; - # ifdef __linux__ # define RULESTYPE "linux" # else @@ -136,10 +134,6 @@ mymain(void) { int ret =3D 0; =20 - abs_top_srcdir =3D getenv("abs_top_srcdir"); - if (!abs_top_srcdir) - abs_top_srcdir =3D abs_srcdir "/.."; - # define DO_TEST(name) \ do { \ static struct testInfo info =3D { \ diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewallt= est.c index b4cfe5769e..bea267f0fc 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -35,8 +35,6 @@ =20 # define VIR_FROM_THIS VIR_FROM_NONE =20 -static const char *abs_top_srcdir; - # ifdef __linux__ # define RULESTYPE "linux" # else @@ -459,10 +457,6 @@ mymain(void) { int ret =3D 0; =20 - abs_top_srcdir =3D getenv("abs_top_srcdir"); - if (!abs_top_srcdir) - abs_top_srcdir =3D abs_srcdir "/.."; - # define DO_TEST(name) \ do { \ static struct testInfo info =3D { \ diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 786f647cf0..42a4643338 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -19,7 +19,6 @@ =20 # define VIR_FROM_THIS VIR_FROM_QEMU =20 -static const char *abs_top_srcdir; static virQEMUDriver driver; =20 struct testInfo { @@ -74,10 +73,6 @@ mymain(void) =20 setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); =20 - abs_top_srcdir =3D getenv("abs_top_srcdir"); - if (!abs_top_srcdir) - abs_top_srcdir =3D abs_srcdir "/.."; - if (qemuTestDriverInit(&driver) < 0) { VIR_FREE(fakerootdir); return EXIT_FAILURE; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 03e8d79595..67c5c74ec5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -33,7 +33,6 @@ =20 # define VIR_FROM_THIS VIR_FROM_QEMU =20 -static const char *abs_top_srcdir; static virQEMUDriver driver; =20 static unsigned char * @@ -653,10 +652,6 @@ mymain(void) =20 setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); =20 - abs_top_srcdir =3D getenv("abs_top_srcdir"); - if (!abs_top_srcdir) - abs_top_srcdir =3D abs_srcdir "/.."; - /* Set the timezone because we are mocking the time() function. * If we don't do that, then localtime() may return unpredictable * results. In order to detect things that just work by a blind diff --git a/tests/virscsitest.c b/tests/virscsitest.c index 665f70e28b..be3ef6234e 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -30,7 +30,6 @@ =20 VIR_LOG_INIT("tests.scsitest"); =20 -static const char *abs_top_srcdir; static char *virscsi_prefix; =20 static int @@ -195,10 +194,6 @@ mymain(void) char *tmpdir =3D NULL; char template[] =3D "/tmp/libvirt_XXXXXX"; =20 - abs_top_srcdir =3D getenv("abs_top_srcdir"); - if (!abs_top_srcdir) - abs_top_srcdir =3D abs_srcdir "/.."; - if (virAsprintf(&virscsi_prefix, "%s" VIR_SCSI_DATA, abs_srcdir) < 0) { ret =3D -1; goto cleanup; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Feb 7 09:15:43 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552495914869305.4057789277276; Wed, 13 Mar 2019 09:51:54 -0700 (PDT) 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 042C130018F0; Wed, 13 Mar 2019 16:51:53 +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 BBE2B601AE; Wed, 13 Mar 2019 16:51:52 +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 78B483FB10; Wed, 13 Mar 2019 16:51:52 +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 x2DGpZot013411 for ; Wed, 13 Mar 2019 12:51:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id DCE5A61532; Wed, 13 Mar 2019 16:51:35 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 28B5E5D706 for ; Wed, 13 Mar 2019 16:51:34 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 17:51:21 +0100 Message-Id: <20190313165123.23324-7-abologna@redhat.com> In-Reply-To: <20190313165123.23324-1-abologna@redhat.com> References: <20190313165123.23324-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/8] Fix names for abs_top_{src, build}dir variables 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: , 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.46]); Wed, 13 Mar 2019 16:51:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" According to the official documentation for autoconf[1], the correct names for these variables are abs_top_{src,build}dir rather than abs_top{src,build}dir; in fact, we're already using the correct names in various places, so let's just make everything nice and consistent. [1] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Pr= eset-Output-Variables.html Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- src/Makefile.am | 8 ++++---- src/conf/domain_conf.c | 2 +- src/cpu/cpu_map.c | 4 ++-- src/driver.c | 2 +- src/locking/lock_driver_lockd.c | 2 +- src/locking/lock_manager.c | 2 +- src/logging/log_manager.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/network/bridge_driver.c | 2 +- src/remote/remote_driver.c | 2 +- src/storage/storage_backend.c | 2 +- src/storage/storage_backend_disk.c | 4 ++-- src/util/virfile.c | 4 ++-- src/util/virstoragefilebackend.c | 2 +- tests/Makefile.am | 8 ++++---- tests/virschematest.c | 2 +- tests/virshtest.c | 4 ++-- tests/virtestmock.c | 4 ++-- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8c8dfe3dcf..0d3d231889 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,9 +18,9 @@ =20 # old automake does not provide abs_{src,build}dir variables abs_builddir =3D $(shell pwd) -abs_topbuilddir =3D $(shell cd .. && pwd) +abs_top_builddir =3D $(shell cd .. && pwd) abs_srcdir =3D $(shell cd $(srcdir) && pwd) -abs_topsrcdir =3D $(shell cd $(top_srcdir) && pwd) +abs_top_srcdir =3D $(shell cd $(top_srcdir) && pwd) =20 # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets @@ -33,8 +33,8 @@ AM_CPPFLAGS =3D -I../gnulib/lib \ -I$(srcdir)/util \ -I./util \ -DIN_LIBVIRT \ - -Dabs_topbuilddir=3D"\"$(abs_topbuilddir)\"" \ - -Dabs_topsrcdir=3D"\"$(abs_topsrcdir)\"" \ + -Dabs_top_builddir=3D"\"$(abs_top_builddir)\"" \ + -Dabs_top_srcdir=3D"\"$(abs_top_srcdir)\"" \ $(NULL) =20 WARN_CFLAGS +=3D $(STRICT_FRAME_LIMIT_CFLAGS) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cfd7221538..0eee982989 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19396,7 +19396,7 @@ virDomainDefParseXML(xmlDocPtr xml, VIR_AUTOFREE(char *) schema =3D NULL; =20 schema =3D virFileFindResource("domain.rng", - abs_topsrcdir "/docs/schemas", + abs_top_srcdir "/docs/schemas", PKGDATADIR "/schemas"); if (!schema) return NULL; diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 83151c1c54..cb9f7c243f 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -96,7 +96,7 @@ cpuMapLoadInclude(const char *filename, char *mapfile; =20 if (!(mapfile =3D virFileFindResource(filename, - abs_topsrcdir "/src/cpu_map", + abs_top_srcdir "/src/cpu_map", PKGDATADIR "/cpu_map"))) return -1; =20 @@ -185,7 +185,7 @@ int cpuMapLoad(const char *arch, char *mapfile; =20 if (!(mapfile =3D virFileFindResource("index.xml", - abs_topsrcdir "/src/cpu_map", + abs_top_srcdir "/src/cpu_map", PKGDATADIR "/cpu_map"))) return -1; =20 diff --git a/src/driver.c b/src/driver.c index 8b5ade763f..5e8f68f6df 100644 --- a/src/driver.c +++ b/src/driver.c @@ -54,7 +54,7 @@ virDriverLoadModule(const char *name, if (!(modfile =3D virFileFindResourceFull(name, "libvirt_driver_", ".so", - abs_topbuilddir "/src/.libs", + abs_top_builddir "/src/.libs", DEFAULT_DRIVER_DIR, "LIBVIRT_DRIVER_DIR"))) return -1; diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index 4ffa92fc9b..f6371f3050 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -221,7 +221,7 @@ static virNetClientPtr virLockManagerLockDaemonConnecti= onNew(bool privileged, if (!privileged && !(daemonPath =3D virFileFindResourceFull("virtlockd", NULL, NULL, - abs_topbuilddir "/src", + abs_top_builddir "/src", SBINDIR, "VIRTLOCKD_PATH"))) goto error; diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index d421b6acfc..1c8705ab11 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -141,7 +141,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const c= har *name, if (!(modfile =3D virFileFindResourceFull(name, NULL, ".so", - abs_topbuilddir "/src/.lib= s", + abs_top_builddir "/src/.li= bs", LIBDIR "/libvirt/lock-driv= er", "LIBVIRT_LOCK_MANAGER_PLUG= IN_DIR"))) goto cleanup; diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index cd7935802d..eb0a32b4b6 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -80,7 +80,7 @@ virLogManagerConnect(bool privileged, if (!privileged && !(daemonPath =3D virFileFindResourceFull("virtlogd", NULL, NULL, - abs_topbuilddir "/src", + abs_top_builddir "/src", SBINDIR, "VIRTLOGD_PATH"))) goto error; diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 4720c99793..2e4cc4f51a 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -94,7 +94,7 @@ virCapsPtr virLXCDriverCapsInit(virLXCDriverPtr driver) } =20 if (!(lxc_path =3D virFileFindResource("libvirt_lxc", - abs_topbuilddir "/src", + abs_top_builddir "/src", LIBEXECDIR))) goto error; =20 diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c3e1381124..6789dafd15 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1488,7 +1488,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkDriverSta= tePtr driver, =20 /* This helper is used to create custom leases file for libvirt */ if (!(leaseshelper_path =3D virFileFindResource("libvirt_leaseshelper", - abs_topbuilddir "/src", + abs_top_builddir "/src", LIBEXECDIR))) goto cleanup; =20 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index eabe7a3823..5c4dd41227 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1079,7 +1079,7 @@ doRemoteOpen(virConnectPtr conn, if ((flags & VIR_DRV_OPEN_REMOTE_AUTOSTART) && !(daemonPath =3D virFileFindResourceFull("libvirtd", NULL, NULL, - abs_topbuilddir "/src", + abs_top_builddir "/src", SBINDIR, "LIBVIRTD_PATH"))) goto failed; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 295d8de479..ed5bdd5bad 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -92,7 +92,7 @@ virStorageDriverLoadBackendModule(const char *name, if (!(modfile =3D virFileFindResourceFull(name, "libvirt_storage_backend_", ".so", - abs_topbuilddir "/src/.libs", + abs_top_builddir "/src/.libs", STORAGE_BACKEND_MODULE_DIR, "LIBVIRT_STORAGE_BACKEND_DIR")= )) return -1; diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backe= nd_disk.c index 4c5b784ca7..9b94d26cf9 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -363,7 +363,7 @@ virStorageBackendDiskReadPartitions(virStoragePoolObjPt= r pool, VIR_AUTOPTR(virCommand) cmd =3D NULL; =20 if (!(parthelper_path =3D virFileFindResource("libvirt_parthelper", - abs_topbuilddir "/src", + abs_top_builddir "/src", LIBEXECDIR))) return -1; =20 @@ -417,7 +417,7 @@ virStorageBackendDiskReadGeometry(virStoragePoolObjPtr = pool) VIR_AUTOPTR(virCommand) cmd =3D NULL; =20 if (!(parthelper_path =3D virFileFindResource("libvirt_parthelper", - abs_topbuilddir "/src", + abs_top_builddir "/src", LIBEXECDIR))) return -1; =20 diff --git a/src/util/virfile.c b/src/util/virfile.c index a4c6d184af..ec8d85929c 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -260,7 +260,7 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned= int flags) } =20 if (!(iohelper_path =3D virFileFindResource("libvirt_iohelper", - abs_topbuilddir "/src", + abs_top_builddir "/src", LIBEXECDIR))) goto error; =20 @@ -1704,7 +1704,7 @@ static bool useDirOverride; * @prefix: optional string to prepend to filename * @suffix: optional string to append to filename * @builddir: location of the filename in the build tree including - * abs_topsrcdir or abs_topbuilddir prefix + * abs_top_srcdir or abs_top_builddir prefix * @installdir: location of the installed binary * @envname: environment variable used to override all dirs * diff --git a/src/util/virstoragefilebackend.c b/src/util/virstoragefileback= end.c index 9acaea2f81..f362436d9b 100644 --- a/src/util/virstoragefilebackend.c +++ b/src/util/virstoragefilebackend.c @@ -57,7 +57,7 @@ virStorageFileLoadBackendModule(const char *name, if (!(modfile =3D virFileFindResourceFull(name, "libvirt_storage_file_", ".so", - abs_topbuilddir "/src/.libs", + abs_top_builddir "/src/.libs", STORAGE_FILE_MODULE_DIR, "LIBVIRT_STORAGE_FILE_DIR"))) return -1; diff --git a/tests/Makefile.am b/tests/Makefile.am index 237336d648..42ec64755d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,9 +18,9 @@ =20 # old automake does not provide abs_{src,build}dir variables abs_builddir =3D $(shell pwd) -abs_topbuilddir =3D $(shell cd .. && pwd) +abs_top_builddir =3D $(shell cd .. && pwd) abs_srcdir =3D $(shell cd $(srcdir) && pwd) -abs_topsrcdir =3D $(shell cd $(top_srcdir) && pwd) +abs_top_srcdir =3D $(shell cd $(top_srcdir) && pwd) =20 SHELL =3D $(PREFERABLY_POSIX_SHELL) =20 @@ -37,9 +37,9 @@ WARN_CFLAGS +=3D $(RELAXED_FRAME_LIMIT_CFLAGS) =20 AM_CFLAGS =3D \ -Dabs_builddir=3D"\"$(abs_builddir)\"" \ - -Dabs_topbuilddir=3D"\"$(abs_topbuilddir)\"" \ + -Dabs_top_builddir=3D"\"$(abs_top_builddir)\"" \ -Dabs_srcdir=3D"\"$(abs_srcdir)\"" \ - -Dabs_topsrcdir=3D"\"$(abs_topsrcdir)\"" \ + -Dabs_top_srcdir=3D"\"$(abs_top_srcdir)\"" \ $(LIBXML_CFLAGS) \ $(LIBNL_CFLAGS) \ $(GNUTLS_CFLAGS) \ diff --git a/tests/virschematest.c b/tests/virschematest.c index 8dfab5e2a3..56bdcb2f88 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -148,7 +148,7 @@ testSchemaGrammar(const void *opaque) int ret =3D -1; =20 if (virAsprintf(&schema_path, "%s/docs/schemas/%s", - abs_topsrcdir, data->schema) < 0) + abs_top_srcdir, data->schema) < 0) return -1; =20 if (!(data->validator =3D virXMLValidatorInit(schema_path))) diff --git a/tests/virshtest.c b/tests/virshtest.c index d77d3d81d4..7e59ad7da6 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -82,13 +82,13 @@ testCompareOutputLit(const char *expectData, return result; } =20 -# define VIRSH_DEFAULT abs_topbuilddir "/tools/virsh", \ +# define VIRSH_DEFAULT abs_top_builddir "/tools/virsh", \ "--connect", \ "test:///default" =20 static char *custom_uri; =20 -# define VIRSH_CUSTOM abs_topbuilddir "/tools/virsh", \ +# define VIRSH_CUSTOM abs_top_builddir "/tools/virsh", \ "--connect", \ custom_uri =20 diff --git a/tests/virtestmock.c b/tests/virtestmock.c index 1cafbec0d5..3049c90789 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -161,8 +161,8 @@ checkPath(const char *path, } =20 =20 - if (!STRPREFIX(path, abs_topsrcdir) && - !STRPREFIX(path, abs_topbuilddir)) { + if (!STRPREFIX(path, abs_top_srcdir) && + !STRPREFIX(path, abs_top_builddir)) { printFile(path, func); } =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Feb 7 09:15:43 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552495914799590.4502680830764; Wed, 13 Mar 2019 09:51:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EF6AE7002C; Wed, 13 Mar 2019 16:51:52 +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 C0F6A1717F; Wed, 13 Mar 2019 16:51:52 +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 7AFC03FB11; Wed, 13 Mar 2019 16:51:52 +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 x2DGpa7v013421 for ; Wed, 13 Mar 2019 12:51:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id A709E5D73F; Wed, 13 Mar 2019 16:51:36 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2AA5C5D706 for ; Wed, 13 Mar 2019 16:51:36 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 17:51:22 +0100 Message-Id: <20190313165123.23324-8-abologna@redhat.com> In-Reply-To: <20190313165123.23324-1-abologna@redhat.com> References: <20190313165123.23324-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 7/8] tests: Don't redefine variables for TESTS_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: , 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 13 Mar 2019 16:51:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We already have code that defines all abs_* variables at the top of tests/Makefile.am, so there is no point in redefining them a second time (using a slightly different shell incantation to boot). Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- tests/Makefile.am | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 42ec64755d..858ed047e8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -469,20 +469,12 @@ endif ! WITH_TESTS TESTS =3D $(test_programs) \ $(test_scripts) =20 -# NB, automake < 1.10 does not provide the real -# abs_top_{src/build}dir or builddir variables, so don't rely -# on them here. Fake them with 'pwd' -# Also, BSD sh doesn't like 'a=3Db b=3D$$a', so we can't use an -# intermediate shell variable, but must do all the expansion in make - -lv_abs_top_builddir=3D$(shell cd '$(top_builddir)' && pwd) - VIR_TEST_EXPENSIVE ?=3D $(VIR_TEST_EXPENSIVE_DEFAULT) TESTS_ENVIRONMENT =3D \ - abs_top_builddir=3D$(lv_abs_top_builddir) \ - abs_top_srcdir=3D`cd '$(top_srcdir)'; pwd` \ - abs_builddir=3D$(abs_builddir) \ - abs_srcdir=3D$(abs_srcdir) \ + abs_top_builddir=3D"$(abs_top_builddir)" \ + abs_top_srcdir=3D"$(abs_top_srcdir)" \ + abs_builddir=3D"$(abs_builddir)" \ + abs_srcdir=3D"$(abs_srcdir)" \ SHELL=3D"$(SHELL)" \ LIBVIRT_AUTOSTART=3D0 \ LC_ALL=3DC \ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Feb 7 09:15:43 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552495926343584.540318760651; Wed, 13 Mar 2019 09:52:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9D44F80E7B; Wed, 13 Mar 2019 16:52:04 +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 66D416B8D0; Wed, 13 Mar 2019 16:52:04 +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 1F98A3FB15; Wed, 13 Mar 2019 16:52:04 +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 x2DGpbi4013431 for ; Wed, 13 Mar 2019 12:51:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7D0FC5D73F; Wed, 13 Mar 2019 16:51:37 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0164B5D706 for ; Wed, 13 Mar 2019 16:51:36 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 17:51:23 +0100 Message-Id: <20190313165123.23324-9-abologna@redhat.com> In-Reply-To: <20190313165123.23324-1-abologna@redhat.com> References: <20190313165123.23324-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 8/8] Don't define abs_* variables ourselves 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: , 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 13 Mar 2019 16:52:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Apparently this was necessary in the past because old versions of autoconf/automake didn't make them available, but these days all of the platforms we target include recent enough autotools - as evidenced by the fact that, for example, we already use abs_top_srcdir in tools/ despite the fact that tools/Makefile.am is missing the same boilerplate. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- src/Makefile.am | 6 ------ tests/Makefile.am | 6 ------ 2 files changed, 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 0d3d231889..4294bd1c6c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,12 +16,6 @@ ## License along with this library. If not, see ## . =20 -# old automake does not provide abs_{src,build}dir variables -abs_builddir =3D $(shell pwd) -abs_top_builddir =3D $(shell cd .. && pwd) -abs_srcdir =3D $(shell cd $(srcdir) && pwd) -abs_top_srcdir =3D $(shell cd $(top_srcdir) && pwd) - # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. diff --git a/tests/Makefile.am b/tests/Makefile.am index 858ed047e8..7ce327c9e8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,12 +16,6 @@ ## License along with this library. If not, see ## . =20 -# old automake does not provide abs_{src,build}dir variables -abs_builddir =3D $(shell pwd) -abs_top_builddir =3D $(shell cd .. && pwd) -abs_srcdir =3D $(shell cd $(srcdir) && pwd) -abs_top_srcdir =3D $(shell cd $(top_srcdir) && pwd) - SHELL =3D $(PREFERABLY_POSIX_SHELL) =20 AM_CPPFLAGS =3D \ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list