Re: [PATCH 3/3] perf tests: Improve temp file cleanup in test_arm_coresight.sh

[Ian Rogers]

On Tue, Sep 21, 2021 at 6:10 AM James Clark <james.clark@xxxxxxx> wrote:
>
> 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.
>
> Signed-off-by: James Clark <james.clark@xxxxxxx>


Acked-by: Ian Rogers <irogers@xxxxxxxxxx>

Thanks,
Ian


>
> ---
>  tools/perf/tests/shell/test_arm_coresight.sh | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/tests/shell/test_arm_coresight.sh b/tools/perf/tests/shell/test_arm_coresight.sh
> index c9eef0bba6f1..6de53b7ef5ff 100755
> --- a/tools/perf/tests/shell/test_arm_coresight.sh
> +++ b/tools/perf/tests/shell/test_arm_coresight.sh
> @@ -9,8 +9,6 @@
>  # SPDX-License-Identifier: GPL-2.0
>  # Leo Yan <leo.yan@xxxxxxxxxx>, 2020
>
> -perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> -file=$(mktemp /tmp/temporary_file.XXXXX)
>  glb_err=0
>
>  skip_if_no_cs_etm_event() {
> @@ -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"
> --
> 2.28.0
>