Skip to content

Commit 33fe7c0

Browse files
James-A-Clarknamhyung
authored andcommitted
perf tests: Fix test_arm_callgraph_fp variable expansion
$TEST_PROGRAM is a command with spaces so it's supposed to be word split. The referenced fix to fix the shellcheck warnings incorrectly quoted this string so unquote it to fix the test. At the same time silence the shellcheck warning for that line and fix two more shellcheck errors at the end of the script. Fixes: 1bb17b4 ("perf tests arm_callgraph_fp: Address shellcheck warnings about signal names and adding double quotes for expression") Signed-off-by: James Clark <james.clark@arm.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Ian Rogers <irogers@google.com> Cc: spoorts2@in.ibm.com Cc: Peter Zijlstra <peterz@infradead.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Cc: Ingo Molnar <mingo@redhat.com> Link: https://lore.kernel.org/r/20230622101809.2431897-1-james.clark@arm.com Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1 parent 765be32 commit 33fe7c0

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

tools/perf/tests/shell/test_arm_callgraph_fp.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ cleanup_files()
1515
trap cleanup_files EXIT TERM INT
1616

1717
# Add a 1 second delay to skip samples that are not in the leaf() function
18-
perf record -o "$PERF_DATA" --call-graph fp -e cycles//u -D 1000 --user-callchains -- "$TEST_PROGRAM" 2> /dev/null &
18+
# shellcheck disable=SC2086
19+
perf record -o "$PERF_DATA" --call-graph fp -e cycles//u -D 1000 --user-callchains -- $TEST_PROGRAM 2> /dev/null &
1920
PID=$!
2021

2122
echo " + Recording (PID=$PID)..."
@@ -33,8 +34,8 @@ wait $PID
3334
# 76c leafloop
3435
# ...
3536

36-
perf script -i $PERF_DATA -F comm,ip,sym | head -n4
37-
perf script -i $PERF_DATA -F comm,ip,sym | head -n4 | \
37+
perf script -i "$PERF_DATA" -F comm,ip,sym | head -n4
38+
perf script -i "$PERF_DATA" -F comm,ip,sym | head -n4 | \
3839
awk '{ if ($2 != "") sym[i++] = $2 } END { if (sym[0] != "leaf" ||
3940
sym[1] != "parent" ||
4041
sym[2] != "leafloop") exit 1 }'

0 commit comments

Comments
 (0)