From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
LKML <linux-kernel@vger.kernel.org>,
Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
linux-perf-users@vger.kernel.org
Subject: [PATCH 8/8] perf test: Do not set TEST_SKIP for record subtests
Date: Thu, 20 Oct 2022 10:26:43 -0700 [thread overview]
Message-ID: <20221020172643.3458767-9-namhyung@kernel.org> (raw)
In-Reply-To: <20221020172643.3458767-1-namhyung@kernel.org>
It now has 4 sub tests and one of them should run at least.
But once TEST_SKIP (= 2) return value is set, it won't be overwritten
unless there's a failure. I think we should return success when one
or more tested are skipped but the remaining subtests are passed.
So update the test code not to set the err variable when it skips
the test.
Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/tests/shell/record.sh | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/tools/perf/tests/shell/record.sh b/tools/perf/tests/shell/record.sh
index 01aa9531b369..e93b3a8871fe 100755
--- a/tools/perf/tests/shell/record.sh
+++ b/tools/perf/tests/shell/record.sh
@@ -81,10 +81,6 @@ test_per_thread() {
if ! perf record -o /dev/null --quiet ${testprog} 2> /dev/null
then
echo "Per-thread record [Skipped event not supported]"
- if [ $err -ne 1 ]
- then
- err=2
- fi
return
fi
if ! perf record --per-thread -o "${perfdata}" ${testprog} 2> /dev/null
@@ -131,10 +127,6 @@ test_register_capture() {
if ! perf list | grep -q 'br_inst_retired.near_call'
then
echo "Register capture test [Skipped missing event]"
- if [ $err -ne 1 ]
- then
- err=2
- fi
return
fi
if ! perf record --intr-regs=\? 2>&1 | grep -q 'available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15'
@@ -159,10 +151,6 @@ test_system_wide() {
if ! perf record -aB --synth=no -o "${perfdata}" ${testprog} 2> /dev/null
then
echo "System-wide record [Skipped not supported]"
- if [ $err -ne 1 ]
- then
- err=2
- fi
return
fi
if ! perf report -i "${perfdata}" -q | grep -q "${testsym}"
--
2.38.0.135.g90850a2211-goog
next prev parent reply other threads:[~2022-10-20 17:27 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-20 17:26 [PATCHSET 0/8] perf test: Improve perf record tests (v2) Namhyung Kim
2022-10-20 17:26 ` [PATCH 1/8] perf test: Do not use instructions:u explicitly Namhyung Kim
2022-10-20 23:47 ` Ian Rogers
2022-10-20 17:26 ` [PATCH 2/8] perf test: Fix shellcheck issues in the record test Namhyung Kim
2022-10-20 23:48 ` Ian Rogers
2022-10-21 8:45 ` Adrian Hunter
2022-10-20 17:26 ` [PATCH 3/8] perf test: Use a test program in perf record tests Namhyung Kim
2022-10-20 23:52 ` Ian Rogers
2022-10-24 11:33 ` Arnaldo Carvalho de Melo
2022-10-24 14:00 ` Adrian Hunter
2022-10-24 16:00 ` Arnaldo Carvalho de Melo
2022-10-25 4:12 ` Namhyung Kim
2022-10-25 13:10 ` Arnaldo Carvalho de Melo
2022-10-25 13:17 ` Adrian Hunter
2022-10-25 4:18 ` Namhyung Kim
2022-10-21 8:45 ` Adrian Hunter
2022-10-20 17:26 ` [PATCH 4/8] perf test: Wait for a new thread when testing --per-thread record Namhyung Kim
2022-10-20 23:57 ` Ian Rogers
2022-10-21 8:45 ` Adrian Hunter
2022-10-20 17:26 ` [PATCH 5/8] perf test: Add system-wide mode in perf record tests Namhyung Kim
2022-10-21 0:00 ` Ian Rogers
2022-10-26 14:11 ` Arnaldo Carvalho de Melo
2022-10-20 17:26 ` [PATCH 6/8] perf test: Add target workload test " Namhyung Kim
2022-10-21 0:01 ` Ian Rogers
2022-10-21 8:45 ` Adrian Hunter
2022-10-20 17:26 ` [PATCH 7/8] perf test: Test record with --threads option Namhyung Kim
2022-10-21 0:02 ` Ian Rogers
2022-10-21 8:45 ` Adrian Hunter
2022-10-20 17:26 ` Namhyung Kim [this message]
2022-10-21 0:05 ` [PATCH 8/8] perf test: Do not set TEST_SKIP for record subtests Ian Rogers
2022-10-24 11:34 ` Arnaldo Carvalho de Melo
2022-10-26 14:15 ` [PATCHSET 0/8] perf test: Improve perf record tests (v2) Arnaldo Carvalho de Melo
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=20221020172643.3458767-9-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.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;
as well as URLs for NNTP newsgroup(s).