From nobody Tue Apr 30 08:55:25 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; 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 1529497241528872.2547188513053; Wed, 20 Jun 2018 05:20:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ADE01C0587E3; Wed, 20 Jun 2018 12:20: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 1D91C2010D59; Wed, 20 Jun 2018 12:20: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 B4F6A1800537; Wed, 20 Jun 2018 12:20:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5KCKYUa003506 for ; Wed, 20 Jun 2018 08:20:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 79C132026D6D; Wed, 20 Jun 2018 12:20:34 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1DA7D2026D6B for ; Wed, 20 Jun 2018 12:20:33 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 20 Jun 2018 14:20:27 +0200 Message-Id: <20180620122029.13795-2-abologna@redhat.com> In-Reply-To: <20180620122029.13795-1-abologna@redhat.com> References: <20180620122029.13795-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 1/3] tests: Fix VIRT_DBUS_INTERFACES_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: , 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.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 20 Jun 2018 12:20:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" D-Bus interface files are generated, so we need to look for them inside builddir instead of srcdir for the test suite to pass before installation. Signed-off-by: Andrea Bolognani --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index e841627..10d2935 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -38,4 +38,4 @@ TESTS =3D $(test_programs) =20 TESTS_ENVIRONMENT =3D \ abs_top_builddir=3D$(abs_top_builddir) \ - VIRT_DBUS_INTERFACES_DIR=3D$(abs_top_srcdir)/data + VIRT_DBUS_INTERFACES_DIR=3D$(abs_top_builddir)/data --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 08:55:25 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; 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 1529497262919174.12827341059983; Wed, 20 Jun 2018 05:21:02 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6613081DFB; Wed, 20 Jun 2018 12:21:01 +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 0844C67145; Wed, 20 Jun 2018 12:21:01 +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 50D794A465; Wed, 20 Jun 2018 12:21:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5KCKZH6003511 for ; Wed, 20 Jun 2018 08:20:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1D6212026D6D; Wed, 20 Jun 2018 12:20:35 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B60A72026D6B for ; Wed, 20 Jun 2018 12:20:34 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 20 Jun 2018 14:20:28 +0200 Message-Id: <20180620122029.13795-3-abologna@redhat.com> In-Reply-To: <20180620122029.13795-1-abologna@redhat.com> References: <20180620122029.13795-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 2/3] tests: Don't loop up abs_top_builddir 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: , 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 20 Jun 2018 12:21:02 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This only works if the caller has prepared the environment accordingly; however, there is already a fallback path in place and it works just fine, so much so that when test cases are executed manually through the 'run' script that's the only one being involved. Drop environment handling entirely and rely on path manipulation instead. Signed-off-by: Andrea Bolognani --- tests/Makefile.am | 1 - tests/libvirttest.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 10d2935..81cb263 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -37,5 +37,4 @@ EXTRA_DIST =3D \ TESTS =3D $(test_programs) =20 TESTS_ENVIRONMENT =3D \ - abs_top_builddir=3D$(abs_top_builddir) \ VIRT_DBUS_INTERFACES_DIR=3D$(abs_top_builddir)/data diff --git a/tests/libvirttest.py b/tests/libvirttest.py index 06e52c0..c1543e8 100644 --- a/tests/libvirttest.py +++ b/tests/libvirttest.py @@ -10,7 +10,7 @@ import time import xmldata =20 =20 -root =3D os.environ.get('abs_top_builddir', os.path.dirname(os.path.dirnam= e(__file__))) +root =3D os.path.dirname(os.path.dirname(__file__)) exe =3D os.path.join(root, 'src', 'libvirt-dbus') =20 DBusGMainLoop(set_as_default=3DTrue) --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 08:55:25 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; 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 1529497270516469.51536649487525; Wed, 20 Jun 2018 05:21:10 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C71E7307D86C; Wed, 20 Jun 2018 12:21:08 +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 66DF45447C; Wed, 20 Jun 2018 12:21:08 +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 F1B9E4A465; Wed, 20 Jun 2018 12:21:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5KCKZCb003516 for ; Wed, 20 Jun 2018 08:20:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id B53EA2026D6D; Wed, 20 Jun 2018 12:20:35 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 593BD2026D6B for ; Wed, 20 Jun 2018 12:20:35 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 20 Jun 2018 14:20:29 +0200 Message-Id: <20180620122029.13795-4-abologna@redhat.com> In-Reply-To: <20180620122029.13795-1-abologna@redhat.com> References: <20180620122029.13795-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 3/3] tests: Use AM_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: , 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 20 Jun 2018 12:21:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" According to the documentation[1], TESTS_ENVIRONMENT is reserved for the user, which means we shouldn't be using it. AM_TESTS_ENVIRONMENT needs to be terminated with a semicolon, so do that; that requires exporting the variables instead of merely declaring them as well. [1] https://www.gnu.org/software/automake/manual/html_node/Scripts_002dbase= d-Testsuites.html Signed-off-by: Andrea Bolognani --- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 81cb263..e27a24a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -36,5 +36,5 @@ EXTRA_DIST =3D \ =20 TESTS =3D $(test_programs) =20 -TESTS_ENVIRONMENT =3D \ - VIRT_DBUS_INTERFACES_DIR=3D$(abs_top_builddir)/data +AM_TESTS_ENVIRONMENT =3D \ + export VIRT_DBUS_INTERFACES_DIR=3D$(abs_top_builddir)/data; --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list