Skip to content

Commit ac96f46

Browse files
James-A-Clarkacmel
authored andcommitted
perf tests: Remove bash constructs from stat_all_pmu.sh
The tests were passing but without testing and were printing the following: $ ./perf test -v 90 90: perf all PMU test : --- start --- test child forked, pid 51650 Testing cpu/branch-instructions/ ./tests/shell/stat_all_pmu.sh: 10: [: Performance counter stats for 'true': 137,307 cpu/branch-instructions/ 0.001686672 seconds time elapsed 0.001376000 seconds user 0.000000000 seconds sys: unexpected operator Changing the regexes to a grep works in sh and prints this: $ ./perf test -v 90 90: perf all PMU test : --- start --- test child forked, pid 60186 [...] Testing tlb_flush.stlb_any test child finished with 0 ---- end ---- perf all PMU test: Ok Signed-off-by: James Clark <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Florian Fainelli <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: John Fastabend <[email protected]> Cc: KP Singh <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Martin KaFai Lau <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Song Liu <[email protected]> Cc: Sumanth Korikkar <[email protected]> Cc: Thomas Richter <[email protected]> Cc: Yonghong Song <[email protected]> Cc: [email protected] Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent a9cdc1c commit ac96f46

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/perf/tests/shell/stat_all_pmu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ set -e
77
for p in $(perf list --raw-dump pmu); do
88
echo "Testing $p"
99
result=$(perf stat -e "$p" true 2>&1)
10-
if [[ ! "$result" =~ "$p" ]] && [[ ! "$result" =~ "<not supported>" ]]; then
10+
if ! echo "$result" | grep -q "$p" && ! echo "$result" | grep -q "<not supported>" ; then
1111
# We failed to see the event and it is supported. Possibly the workload was
1212
# too small so retry with something longer.
1313
result=$(perf stat -e "$p" perf bench internals synthesize 2>&1)
14-
if [[ ! "$result" =~ "$p" ]]; then
14+
if ! echo "$result" | grep -q "$p" ; then
1515
echo "Event '$p' not printed in:"
1616
echo "$result"
1717
exit 1

0 commit comments

Comments
 (0)