Skip to content

Commit

Permalink
perf tests: Improve temp file cleanup in test_arm_coresight.sh
Browse files Browse the repository at this point in the history
Cleanup perf.data.old files which are also dropped by perf, handle
sigint and propagate it to the parent in case the test is run in a bash
while loop and don't create the temp files if the test will be skipped.

Reviewed-by: Leo Yan <leo.yan@linaro.org>
Signed-off-by: James Clark <james.clark@arm.com>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20210921131009.390810-3-james.clark@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
James Clark authored and Arnaldo Carvalho de Melo committed Oct 26, 2021
1 parent 39c5348 commit 133fe2e
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions tools/perf/tests/shell/test_arm_coresight.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
# SPDX-License-Identifier: GPL-2.0
# Leo Yan <leo.yan@linaro.org>, 2020

perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
file=$(mktemp /tmp/temporary_file.XXXXX)
glb_err=0

skip_if_no_cs_etm_event() {
Expand All @@ -22,13 +20,20 @@ skip_if_no_cs_etm_event() {

skip_if_no_cs_etm_event || exit 2

perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
file=$(mktemp /tmp/temporary_file.XXXXX)

cleanup_files()
{
rm -f ${perfdata}
rm -f ${file}
rm -f "${perfdata}.old"
trap - exit term int
kill -2 $$
exit $glb_err
}

trap cleanup_files exit
trap cleanup_files exit term int

record_touch_file() {
echo "Recording trace (only user mode) with path: CPU$2 => $1"
Expand Down

0 comments on commit 133fe2e

Please sign in to comment.