From: Marc Hartmayer <mhartmay@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: Thomas Huth <thuth@redhat.com>,
David Hildenbrand <david@redhat.com>,
Janosch Frank <frankja@linux.ibm.com>,
Cornelia Huck <cohuck@redhat.com>,
Andrew Jones <drjones@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
linux-s390@vger.kernel.org
Subject: [PATCH kvm-unit-tests v2 1/4] common.bash: run `cmd` only if a test case was found
Date: Wed, 23 Sep 2020 15:47:55 +0200 [thread overview]
Message-ID: <20200923134758.19354-2-mhartmay@linux.ibm.com> (raw)
In-Reply-To: <20200923134758.19354-1-mhartmay@linux.ibm.com>
It's only useful to run `cmd` in `for_each_unittest` if a test case
was found. This change allows us to remove the guards from the
functions `run_task` and `mkstandalone`.
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
---
run_tests.sh | 3 ---
scripts/common.bash | 8 ++++++--
scripts/mkstandalone.sh | 4 ----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/run_tests.sh b/run_tests.sh
index fc4b3c23d886..12b63954721d 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -133,9 +133,6 @@ RUNTIME_log_stdout () {
function run_task()
{
local testname="$1"
- if [ -z "$testname" ]; then
- return
- fi
while (( $(jobs | wc -l) == $unittest_run_queues )); do
# wait for any background test to finish
diff --git a/scripts/common.bash b/scripts/common.bash
index 9a6ebbd7f287..96655c9ffd1f 100644
--- a/scripts/common.bash
+++ b/scripts/common.bash
@@ -17,7 +17,9 @@ function for_each_unittest()
while read -r -u $fd line; do
if [[ "$line" =~ ^\[(.*)\]$ ]]; then
- "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+ if [ -n "${testname}" ]; then
+ "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+ fi
testname=${BASH_REMATCH[1]}
smp=1
kernel=""
@@ -45,6 +47,8 @@ function for_each_unittest()
timeout=${BASH_REMATCH[1]}
fi
done
- "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+ if [ -n "${testname}" ]; then
+ "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+ fi
exec {fd}<&-
}
diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
index 9d506cc95072..cefdec30cb33 100755
--- a/scripts/mkstandalone.sh
+++ b/scripts/mkstandalone.sh
@@ -83,10 +83,6 @@ function mkstandalone()
{
local testname="$1"
- if [ -z "$testname" ]; then
- return
- fi
-
if [ -n "$one_testname" ] && [ "$testname" != "$one_testname" ]; then
return
fi
--
2.25.4
WARNING: multiple messages have this Message-ID (diff)
From: Marc Hartmayer <mhartmay@linux.ibm.com>
To: <kvm@vger.kernel.org>
Cc: Thomas Huth <thuth@redhat.com>,
David Hildenbrand <david@redhat.com>,
Janosch Frank <frankja@linux.ibm.com>,
Cornelia Huck <cohuck@redhat.com>,
Andrew Jones <drjones@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
linux-s390@vger.kernel.org
Subject: [PATCH kvm-unit-tests v2 1/4] common.bash: run `cmd` only if a test case was found
Date: Wed, 23 Sep 2020 15:47:55 +0200 [thread overview]
Message-ID: <20200923134758.19354-2-mhartmay@linux.ibm.com> (raw)
In-Reply-To: <20200923134758.19354-1-mhartmay@linux.ibm.com>
It's only useful to run `cmd` in `for_each_unittest` if a test case
was found. This change allows us to remove the guards from the
functions `run_task` and `mkstandalone`.
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
---
run_tests.sh | 3 ---
scripts/common.bash | 8 ++++++--
scripts/mkstandalone.sh | 4 ----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/run_tests.sh b/run_tests.sh
index fc4b3c23d886..12b63954721d 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -133,9 +133,6 @@ RUNTIME_log_stdout () {
function run_task()
{
local testname="$1"
- if [ -z "$testname" ]; then
- return
- fi
while (( $(jobs | wc -l) == $unittest_run_queues )); do
# wait for any background test to finish
diff --git a/scripts/common.bash b/scripts/common.bash
index 9a6ebbd7f287..96655c9ffd1f 100644
--- a/scripts/common.bash
+++ b/scripts/common.bash
@@ -17,7 +17,9 @@ function for_each_unittest()
while read -r -u $fd line; do
if [[ "$line" =~ ^\[(.*)\]$ ]]; then
- "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+ if [ -n "${testname}" ]; then
+ "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+ fi
testname=${BASH_REMATCH[1]}
smp=1
kernel=""
@@ -45,6 +47,8 @@ function for_each_unittest()
timeout=${BASH_REMATCH[1]}
fi
done
- "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+ if [ -n "${testname}" ]; then
+ "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+ fi
exec {fd}<&-
}
diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
index 9d506cc95072..cefdec30cb33 100755
--- a/scripts/mkstandalone.sh
+++ b/scripts/mkstandalone.sh
@@ -83,10 +83,6 @@ function mkstandalone()
{
local testname="$1"
- if [ -z "$testname" ]; then
- return
- fi
-
if [ -n "$one_testname" ] && [ "$testname" != "$one_testname" ]; then
return
fi
--
2.25.4
next prev parent reply other threads:[~2020-09-23 13:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 13:47 [PATCH kvm-unit-tests v2 0/4] s390x: Add Protected VM support Marc Hartmayer
2020-09-23 13:47 ` Marc Hartmayer
2020-09-23 13:47 ` Marc Hartmayer [this message]
2020-09-23 13:47 ` [PATCH kvm-unit-tests v2 1/4] common.bash: run `cmd` only if a test case was found Marc Hartmayer
2020-09-23 13:47 ` [PATCH kvm-unit-tests v2 2/4] scripts: add support for architecture dependent functions Marc Hartmayer
2020-09-23 13:47 ` Marc Hartmayer
2020-09-23 13:47 ` [PATCH kvm-unit-tests v2 3/4] run_tests/mkstandalone: add arch_cmd hook Marc Hartmayer
2020-09-23 13:47 ` Marc Hartmayer
2020-09-23 13:47 ` [PATCH kvm-unit-tests v2 4/4] s390x: add Protected VM support Marc Hartmayer
2020-09-23 13:47 ` Marc Hartmayer
2020-09-25 9:12 ` Cornelia Huck
2020-09-25 9:12 ` Cornelia Huck
2020-09-28 11:44 ` Thomas Huth
2020-09-28 12:33 ` Marc Hartmayer
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=20200923134758.19354-2-mhartmay@linux.ibm.com \
--to=mhartmay@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=drjones@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=thuth@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.