From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: eesposit@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com,
qemu-block@nongnu.org, mreitz@redhat.com
Subject: [PATCH v2 4/5] qemu-iotests: let "check" spawn an arbitrary test command
Date: Tue, 23 Mar 2021 19:19:26 +0100 [thread overview]
Message-ID: <20210323181928.311862-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20210323181928.311862-1-pbonzini@redhat.com>
Right now there is no easy way for "check" to print a reproducer command.
Because such a reproducer command line would be huge, we can instead teach
check to start a command of our choice. This can be for example a Python
unit test with arguments to only run a specific subtest.
Move the trailing empty line to print_env(), since it always looks better
and one caller was not adding it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/qemu-iotests/check | 15 ++++++++++++++-
tests/qemu-iotests/testenv.py | 3 ++-
tests/qemu-iotests/testrunner.py | 1 -
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index d1c87ceaf1..478d74e509 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -19,6 +19,7 @@
import os
import sys
import argparse
+import shutil
from findtests import TestFinder
from testenv import TestEnv
from testrunner import TestRunner
@@ -101,7 +102,7 @@ def make_argparser() -> argparse.ArgumentParser:
'rerun failed ./check command, starting from the '
'middle of the process.')
g_sel.add_argument('tests', metavar='TEST_FILES', nargs='*',
- help='tests to run')
+ help='tests to run, or "--" followed by a command')
return p
@@ -114,6 +115,18 @@ if __name__ == '__main__':
imgopts=args.imgopts, misalign=args.misalign,
debug=args.debug, valgrind=args.valgrind)
+ if len(sys.argv) > 1 and sys.argv[-len(args.tests)-1] == '--':
+ if not args.tests:
+ sys.exit("missing command after '--'")
+ cmd = args.tests
+ env.print_env()
+ exec_path = shutil.which(cmd[0])
+ if exec_path is None:
+ sys.exit('command not found: ' + cmd[0])
+ cmd[0] = exec_path
+ full_env = env.prepare_subprocess(cmd)
+ os.execve(cmd[0], cmd, full_env)
+
testfinder = TestFinder(test_dir=env.source_iotests)
groups = args.groups.split(',') if args.groups else None
diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
index 341a4af4e9..6767eeeb25 100644
--- a/tests/qemu-iotests/testenv.py
+++ b/tests/qemu-iotests/testenv.py
@@ -283,7 +283,8 @@ def print_env(self) -> None:
PLATFORM -- {platform}
TEST_DIR -- {TEST_DIR}
SOCK_DIR -- {SOCK_DIR}
-SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}"""
+SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}
+"""
args = collections.defaultdict(str, self.get_env())
diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunner.py
index 519924dc81..2f56ac545d 100644
--- a/tests/qemu-iotests/testrunner.py
+++ b/tests/qemu-iotests/testrunner.py
@@ -316,7 +316,6 @@ def run_tests(self, tests: List[str]) -> bool:
if not self.makecheck:
self.env.print_env()
- print()
test_field_width = max(len(os.path.basename(t)) for t in tests) + 2
--
2.30.1
next prev parent reply other threads:[~2021-03-23 18:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 18:19 [PATCH v2 0/5] qemu-iotests: quality of life improvements Paolo Bonzini
2021-03-23 18:19 ` [PATCH v2 1/5] qemu-iotests: do not buffer the test output Paolo Bonzini
2021-03-23 18:54 ` Vladimir Sementsov-Ogievskiy
2021-03-23 18:57 ` Vladimir Sementsov-Ogievskiy
2021-03-23 18:19 ` [PATCH v2 2/5] qemu-iotests: allow passing unittest.main arguments to the test scripts Paolo Bonzini
2021-03-23 19:02 ` Vladimir Sementsov-Ogievskiy
2021-03-23 19:17 ` Vladimir Sementsov-Ogievskiy
2021-03-23 21:22 ` Paolo Bonzini
2021-03-24 7:34 ` Vladimir Sementsov-Ogievskiy
2021-03-23 18:19 ` [PATCH v2 3/5] qemu-iotests: move command line and environment handling from TestRunner to TestEnv Paolo Bonzini
2021-03-23 18:19 ` Paolo Bonzini [this message]
2021-03-23 19:12 ` [PATCH v2 4/5] qemu-iotests: let "check" spawn an arbitrary test command Vladimir Sementsov-Ogievskiy
2021-03-23 21:20 ` Paolo Bonzini
2021-03-24 7:36 ` Vladimir Sementsov-Ogievskiy
2021-03-23 18:19 ` [PATCH v2 5/5] qemu-iotests: fix case of SOCK_DIR already in the environment Paolo Bonzini
2021-03-24 15:17 ` [PATCH v2 0/5] qemu-iotests: quality of life improvements Emanuele Giuseppe Esposito
2021-03-25 18:15 ` Max Reitz
2021-03-26 6:50 ` Paolo Bonzini
2021-03-26 13:40 ` Max Reitz
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=20210323181928.311862-5-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=eesposit@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.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.