Commit ef238109 authored by Ian Rogers's avatar Ian Rogers Committed by Namhyung Kim
Browse files

perf build: Rename TEST_LOGS to SHELL_TEST_LOGS 



Rename TEST_LOGS to SHELL_TEST_LOGS as later changes will add more
kinds of test logs.
Minor comment tweak in Makefile.perf as more than just test shell
tests are checked.

Reviewed-by: default avatarJames Clark <james.clark@linaro.org>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20250311213628.569562-3-irogers@google.com


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 935e7cb5

tools/perf/Build

+3 −3
Original line number Diff line number Diff line
@@ -65,14 +65,14 @@ gtk-y += ui/gtk/ 


ifdef SHELLCHECK

  SHELL_TESTS := $(wildcard *.sh)

  TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)

  SHELL_TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)

else

  SHELL_TESTS :=

  TEST_LOGS :=

  SHELL_TEST_LOGS :=

endif



$(OUTPUT)%.shellcheck_log: %

	$(call rule_mkdir)

	$(Q)$(call echo-cmd,test)shellcheck -s bash -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)



perf-y += $(TEST_LOGS)
 
perf-y += $(SHELL_TEST_LOGS)

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ else 
  force_fixdep := $(config)

endif



# Runs shellcheck on perf test shell scripts

# Runs shellcheck on perf shell scripts

ifeq ($(NO_SHELLCHECK),1)

  SHELLCHECK :=

else

tools/perf/arch/x86/Build

+3 −3
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ perf-util-y += util/ 
perf-test-y += tests/



ifdef SHELLCHECK

  TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)

  SHELL_TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)

else

  SHELL_TESTS :=

  TEST_LOGS :=

  SHELL_TEST_LOGS :=

endif



$(OUTPUT)%.shellcheck_log: %

	$(call rule_mkdir)

	$(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)



perf-test-y += $(TEST_LOGS)
 
perf-test-y += $(SHELL_TEST_LOGS)

tools/perf/arch/x86/tests/Build

+3 −3
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ perf-test-y += amd-ibs-via-core-pmu.o 


ifdef SHELLCHECK

  SHELL_TESTS := gen-insn-x86-dat.sh

  TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)

  SHELL_TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)

else

  SHELL_TESTS :=

  TEST_LOGS :=

  SHELL_TEST_LOGS :=

endif



$(OUTPUT)%.shellcheck_log: %

	$(call rule_mkdir)

	$(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)



perf-test-y += $(TEST_LOGS)
 
perf-test-y += $(SHELL_TEST_LOGS)

tools/perf/tests/Build

+3 −3
Original line number Diff line number Diff line
@@ -80,14 +80,14 @@ perf-test-y += workloads/ 


ifdef SHELLCHECK

  SHELL_TESTS := $(shell find tests/shell -executable -type f -name '*.sh')

  TEST_LOGS := $(SHELL_TESTS:tests/shell/%=shell/%.shellcheck_log)

  SHELL_TEST_LOGS := $(SHELL_TESTS:tests/shell/%=shell/%.shellcheck_log)

else

  SHELL_TESTS :=

  TEST_LOGS :=

  SHELL_TEST_LOGS :=

endif



$(OUTPUT)%.shellcheck_log: %

	$(call rule_mkdir)

	$(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)



perf-test-y += $(TEST_LOGS)
 
perf-test-y += $(SHELL_TEST_LOGS)