From: Adrian Hunter <adrian.hunter@intel.com>
To: Ian Rogers <irogers@google.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1] perf test: Skip diff test if test_loop is missing
Date: Tue, 5 Dec 2023 21:22:14 +0200 [thread overview]
Message-ID: <b72ee8f2-1dae-49a4-b89e-4d5453c8834f@intel.com> (raw)
In-Reply-To: <20231205164924.835682-1-irogers@google.com>
On 5/12/23 18:49, Ian Rogers wrote:
> The diff test depends on finding the symbol test_loop in perf and will
> fail if perf has been stripped and no debug object is available. In
> that case, skip the test instead.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/tests/shell/diff.sh | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/tools/perf/tests/shell/diff.sh b/tools/perf/tests/shell/diff.sh
> index 213185763688..14b87af88703 100755
> --- a/tools/perf/tests/shell/diff.sh
> +++ b/tools/perf/tests/shell/diff.sh
> @@ -9,8 +9,15 @@ perfdata1=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> perfdata2=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> perfdata3=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> testprog="perf test -w thloop"
> +
> +shelldir=$(dirname "$0")
> +# shellcheck source=lib/perf_has_symbol.sh
> +. "${shelldir}"/lib/perf_has_symbol.sh
> +
> testsym="test_loop"
>
> +skip_test_missing_symbol ${testsym}
> +
> cleanup() {
> rm -rf "${perfdata1}"
> rm -rf "${perfdata1}".old
The verbose output in the error case could also
be tweaked.
Before patch:
$ strip tools/perf/perf
$ tools/perf/perf buildid-cache -p $(realpath tools/perf/perf)
$ tools/perf/perf test -v 'diff test'
85: perf diff tests :
--- start ---
test child forked, pid 8621
Basic two file diff test
./tools/perf/tests/shell/diff.sh: 51: [: Workload: unexpected operator
./tools/perf/tests/shell/diff.sh: 56: [: Workload: unexpected operator
Basic two file diff test [Failed diff]
Basic three file diff test
./tools/perf/tests/shell/diff.sh: 73: [: Workload: unexpected operator
./tools/perf/tests/shell/diff.sh: 78: [: Workload: unexpected operator
./tools/perf/tests/shell/diff.sh: 83: [: Workload: unexpected operator
Basic three file diff test [Failed diff]
test child finished with -1
---- end ----
perf diff tests: FAILED!
After patch:
$ tools/perf/perf test -v 'diff test'
85: perf diff tests :
--- start ---
test child forked, pid 8853
perf does not have symbol 'test_loop'
perf is missing symbols - skipping test
test child finished with -2
---- end ----
perf diff tests: Skip
and with symbols:
$ tools/perf/perf test -v 'diff test'
85: perf diff tests :
--- start ---
test child forked, pid 10122
103e20-103e60 g test_loop
perf does have symbol 'test_loop'
Basic two file diff test
Basic two file diff test [Success]
Basic three file diff test
Basic three file diff test [Success]
test child finished with 0
---- end ----
perf diff tests: Ok
Tested-by: Adrian Hunter <adrian.hunter@intel.com>
prev parent reply other threads:[~2023-12-05 19:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 16:49 [PATCH v1] perf test: Skip diff test if test_loop is missing Ian Rogers
2023-12-05 19:22 ` Adrian Hunter [this message]
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=b72ee8f2-1dae-49a4-b89e-4d5453c8834f@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@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