Re: [PATCH] selftests: amd-pstate: fix TEST_FILES

From: Huang Rui
Date: Fri Mar 03 2023 - 01:06:27 EST


On Sat, Feb 04, 2023 at 09:34:54PM +0800, Guillaume Tucker wrote:
> Bring back the Python scripts that were initially added with
> TEST_GEN_FILES but now with TEST_FILES to avoid having them deleted
> when doing a clean. Also fix the way the architecture is being
> determined as they should also be installed when ARCH=x86_64 is
> provided explicitly. Then also append extra files to TEST_FILES and
> TEST_PROGS with += so they don't get discarded.
>
> Fixes: ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")
> Fixes: ac527cee87c9 ("selftests: amd-pstate: Don't delete source files via Makefile")
> Signed-off-by: Guillaume Tucker <guillaume.tucker@xxxxxxxxxxxxx>

Acked-by: Huang Rui <ray.huang@xxxxxxx>

> ---
> tools/testing/selftests/amd-pstate/Makefile | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/amd-pstate/Makefile b/tools/testing/selftests/amd-pstate/Makefile
> index 5fd1424db37d..c382f579fe94 100644
> --- a/tools/testing/selftests/amd-pstate/Makefile
> +++ b/tools/testing/selftests/amd-pstate/Makefile
> @@ -4,10 +4,15 @@
> # No binaries, but make sure arg-less "make" doesn't trigger "run_tests"
> all:
>
> -uname_M := $(shell uname -m 2>/dev/null || echo not)
> -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
> +ARCH ?= $(shell uname -m 2>/dev/null || echo not)
> +ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
>
> -TEST_PROGS := run.sh
> -TEST_FILES := basic.sh tbench.sh gitsource.sh
> +ifeq (x86,$(ARCH))
> +TEST_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
> +TEST_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
> +endif
> +
> +TEST_PROGS += run.sh
> +TEST_FILES += basic.sh tbench.sh gitsource.sh
>
> include ../lib.mk
> --
> 2.30.2
>