From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org
Subject: [PATCH] fstests: make check actually honor expunged list
Date: Fri, 21 Jul 2023 15:48:24 -0400 [thread overview]
Message-ID: <732fc62557b3dfdba820b83cd9643de314b6976e.1689968898.git.josef@toxicpanda.com> (raw)
The patch 60054d51 ("check: fix excluded tests are only expunged in the
first iteration") messed up the logic, if _function will be true if it
gets 1, so the _expunge_test return values are inverted. Also it
appears bash swallows the output in this calling convention, so you
don't get the 'expunged' output. I noticed this when my CI system
stopped honoring my exclude list, this makes everything work properly
again.
Fixes: 60054d51 ("check: fix excluded tests are only expunged in the first iteration")
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
check | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/check b/check
index c8593252..b731af74 100755
--- a/check
+++ b/check
@@ -570,11 +570,10 @@ _expunge_test()
for f in "${exclude_tests[@]}"; do
if [ "${TEST_ID}" == "$f" ]; then
- echo " [expunged]"
- return 0
+ return 1
fi
done
- return 1
+ return 0
}
# retain files which would be overwritten in subsequent reruns of the same test
@@ -870,6 +869,7 @@ function run_section()
if $showme; then
if _expunge_test $seqnum; then
+ echo " [expunged]"
tc_status="expunge"
else
echo
@@ -896,6 +896,7 @@ function run_section()
# check if we really should run it
if _expunge_test $seqnum; then
+ echo " [expunged]"
tc_status="expunge"
_stash_test_status "$seqnum" "$tc_status"
continue
--
2.41.0
next reply other threads:[~2023-07-21 19:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-21 19:48 Josef Bacik [this message]
2023-07-21 20:04 ` [PATCH] fstests: make check actually honor expunged list Josef Bacik
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=732fc62557b3dfdba820b83cd9643de314b6976e.1689968898.git.josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=fstests@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox