From: Nicholas Piggin <npiggin@gmail.com>
To: Andrew Jones <andrew.jones@linux.dev>
Cc: "Nicholas Piggin" <npiggin@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Alexandru Elisei" <alexandru.elisei@arm.com>,
"Eric Auger" <eric.auger@redhat.com>,
"Janosch Frank" <frankja@linux.ibm.com>,
"Claudio Imbrenda" <imbrenda@linux.ibm.com>,
"Nico Böhr" <nrb@linux.ibm.com>,
"David Hildenbrand" <david@redhat.com>,
"Shaoqin Huang" <shahuang@redhat.com>,
"Nikos Nikoleris" <nikos.nikoleris@arm.com>,
"David Woodhouse" <dwmw@amazon.co.uk>,
"Ricardo Koller" <ricarkol@google.com>,
rminmin <renmm6@chinaunicom.cn>, "Gavin Shan" <gshan@redhat.com>,
"Nina Schoetterl-Glausch" <nsg@linux.ibm.com>,
"Sean Christopherson" <seanjc@google.com>,
kvm@vger.kernel.org, kvmarm@lists.linux.dev,
kvm-riscv@lists.infradead.org, linux-s390@vger.kernel.org
Subject: [RFC kvm-unit-tests PATCH v2 06/14] shellcheck: Fix SC2155
Date: Sat, 6 Apr 2024 22:38:15 +1000 [thread overview]
Message-ID: <20240406123833.406488-7-npiggin@gmail.com> (raw)
In-Reply-To: <20240406123833.406488-1-npiggin@gmail.com>
SC2155 (warning): Declare and assign separately to avoid masking
return values.
No bug identified.
Reviewed-by: Andrew Jones <andrew.jones@linux.dev>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
scripts/arch-run.bash | 10 +++++++---
scripts/runtime.bash | 4 +++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash
index f9d1fade9..ae4b06679 100644
--- a/scripts/arch-run.bash
+++ b/scripts/arch-run.bash
@@ -411,7 +411,8 @@ initrd_cleanup ()
{
rm -f $KVM_UNIT_TESTS_ENV
if [ "$KVM_UNIT_TESTS_ENV_OLD" ]; then
- export KVM_UNIT_TESTS_ENV="$KVM_UNIT_TESTS_ENV_OLD"
+ export KVM_UNIT_TESTS_ENV
+ KVM_UNIT_TESTS_ENV="$KVM_UNIT_TESTS_ENV_OLD"
else
unset KVM_UNIT_TESTS_ENV
fi
@@ -423,7 +424,8 @@ initrd_create ()
if [ "$ENVIRON_DEFAULT" = "yes" ]; then
trap_exit_push 'initrd_cleanup'
[ -f "$KVM_UNIT_TESTS_ENV" ] && export KVM_UNIT_TESTS_ENV_OLD="$KVM_UNIT_TESTS_ENV"
- export KVM_UNIT_TESTS_ENV=$(mktemp)
+ export KVM_UNIT_TESTS_ENV
+ KVM_UNIT_TESTS_ENV=$(mktemp)
env_params
env_file
env_errata || return $?
@@ -566,7 +568,9 @@ env_generate_errata ()
trap_exit_push ()
{
- local old_exit=$(trap -p EXIT | sed "s/^[^']*'//;s/'[^']*$//")
+ local old_exit
+
+ old_exit=$(trap -p EXIT | sed "s/^[^']*'//;s/'[^']*$//")
trap -- "$1; $old_exit" EXIT
}
diff --git a/scripts/runtime.bash b/scripts/runtime.bash
index f79c4e281..3b76aec9e 100644
--- a/scripts/runtime.bash
+++ b/scripts/runtime.bash
@@ -15,7 +15,9 @@ extract_summary()
# We assume that QEMU is going to work if it tried to load the kernel
premature_failure()
{
- local log="$(eval "$(get_cmdline _NO_FILE_4Uhere_)" 2>&1)"
+ local log
+
+ log="$(eval "$(get_cmdline _NO_FILE_4Uhere_)" 2>&1)"
echo "$log" | grep "_NO_FILE_4Uhere_" |
grep -q -e "[Cc]ould not \(load\|open\) kernel" \
--
2.43.0
next prev parent reply other threads:[~2024-04-06 12:39 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-06 12:38 [RFC kvm-unit-tests PATCH v2 00/14] add shellcheck support Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 01/14] Add initial shellcheck checking Nicholas Piggin
2024-04-11 7:03 ` Thomas Huth
2024-04-16 4:35 ` Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 02/14] shellcheck: Fix SC2223 Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 03/14] shellcheck: Fix SC2295 Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 04/14] shellcheck: Fix SC2094 Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 05/14] shellcheck: Fix SC2006 Nicholas Piggin
2024-04-06 12:38 ` Nicholas Piggin [this message]
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 07/14] shellcheck: Fix SC2143 Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 08/14] shellcheck: Fix SC2013 Nicholas Piggin
2024-04-08 7:34 ` Andrew Jones
2024-04-10 4:29 ` Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 09/14] shellcheck: Fix SC2145 Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 10/14] shellcheck: Fix SC2124 Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 11/14] shellcheck: Fix SC2294 Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 12/14] shellcheck: Fix SC2178 Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 13/14] shellcheck: Fix SC2048 Nicholas Piggin
2024-04-06 12:38 ` [RFC kvm-unit-tests PATCH v2 14/14] shellcheck: Suppress various messages Nicholas Piggin
2024-04-08 7:37 ` Andrew Jones
2024-04-15 11:59 ` [RFC kvm-unit-tests PATCH v2 00/14] add shellcheck support Thomas Huth
2024-04-16 3:26 ` Nicholas Piggin
2024-04-16 4:46 ` Thomas Huth
2024-04-17 1:40 ` Nicholas Piggin
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=20240406123833.406488-7-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=alexandru.elisei@arm.com \
--cc=andrew.jones@linux.dev \
--cc=david@redhat.com \
--cc=dwmw@amazon.co.uk \
--cc=eric.auger@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=gshan@redhat.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-s390@vger.kernel.org \
--cc=nikos.nikoleris@arm.com \
--cc=nrb@linux.ibm.com \
--cc=nsg@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=renmm6@chinaunicom.cn \
--cc=ricarkol@google.com \
--cc=seanjc@google.com \
--cc=shahuang@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.