All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Cornelia Huck" <cohuck@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Samuel Ortiz" <sameo@linux.intel.com>
Subject: [Qemu-devel] [PATCH v6 3/7] Acceptance tests: add the build directory to the system PATH
Date: Thu,  6 Jun 2019 17:14:10 -0400	[thread overview]
Message-ID: <20190606211414.8681-4-crosa@redhat.com> (raw)
In-Reply-To: <20190606211414.8681-1-crosa@redhat.com>

So that when binaries such as qemu-img are searched for, those in the
build tree will be favored.  As a clarification, SRC_ROOT_DIR is
dependent on the location from where tests are executed, so they are
equal to the build directory if one is being used.

The original motivation is that Avocado libraries such as
avocado.utils.vmimage.get() may use the matching binaries, but it may
also apply to any other binary that test code may eventually attempt
to execute.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
 tests/acceptance/avocado_qemu/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index ac59d36a4c..47c57a9221 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -52,6 +52,12 @@ def pick_default_qemu_bin(arch=None):
 
 class Test(avocado.Test):
     def setUp(self):
+        # Some utility code uses binaries from the system's PATH.  For
+        # instance, avocado.utils.vmimage.get() uses qemu-img, to
+        # create a snapshot image.  This is a transparent way of
+        # making sure those utilities find and use binaries on the
+        # build tree by default.
+        os.environ['PATH'] = '%s:%s' % (SRC_ROOT_DIR, os.environ['PATH'])
         self._vms = {}
         arches = self.tags.get('arch', [])
         if len(arches) == 1:
-- 
2.21.0



  parent reply	other threads:[~2019-06-06 21:33 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-06 21:14 [Qemu-devel] [PATCH v6 0/7] Add "boot_linux" acceptance test Cleber Rosa
2019-06-06 21:14 ` [Qemu-devel] [PATCH v6 1/7] Acceptance tests: use relative location for tests Cleber Rosa
2019-06-06 21:14 ` [Qemu-devel] [PATCH v6 2/7] Acceptance tests: keep a stable reference to the QEMU build dir Cleber Rosa
2019-06-06 21:14 ` Cleber Rosa [this message]
2019-06-06 21:14 ` [Qemu-devel] [PATCH v6 4/7] Acceptance tests: depend on qemu-img Cleber Rosa
2019-06-06 21:14 ` [Qemu-devel] [PATCH v6 5/7] Add "boot_linux" test for x86_64 and pc and q35 machine types Cleber Rosa
2019-06-06 21:14 ` [Qemu-devel] [PATCH v6 6/7] Add "boot_linux" test for aarch64 and virt machine type Cleber Rosa
2019-06-06 21:14 ` [Qemu-devel] [PATCH v6 7/7] [RFC]: use Avocado data drainer for console logging Cleber Rosa
2019-06-06 23:03 ` [Qemu-devel] [PATCH v6 0/7] Add "boot_linux" acceptance test no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190606211414.8681-4-crosa@redhat.com \
    --to=crosa@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=cohuck@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=fam@euphon.net \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sameo@linux.intel.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.