Skip to content

Commit ef23810

Browse files
captain5050namhyung
authored andcommitted
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: James Clark <james.clark@linaro.org> Signed-off-by: Ian Rogers <irogers@google.com> Link: https://lore.kernel.org/r/20250311213628.569562-3-irogers@google.com Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1 parent 935e7cb commit ef23810

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

tools/perf/Build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ gtk-y += ui/gtk/
6565

6666
ifdef SHELLCHECK
6767
SHELL_TESTS := $(wildcard *.sh)
68-
TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)
68+
SHELL_TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)
6969
else
7070
SHELL_TESTS :=
71-
TEST_LOGS :=
71+
SHELL_TEST_LOGS :=
7272
endif
7373

7474
$(OUTPUT)%.shellcheck_log: %
7575
$(call rule_mkdir)
7676
$(Q)$(call echo-cmd,test)shellcheck -s bash -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
7777

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

tools/perf/Makefile.perf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ else
289289
force_fixdep := $(config)
290290
endif
291291

292-
# Runs shellcheck on perf test shell scripts
292+
# Runs shellcheck on perf shell scripts
293293
ifeq ($(NO_SHELLCHECK),1)
294294
SHELLCHECK :=
295295
else

tools/perf/arch/x86/Build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ perf-util-y += util/
22
perf-test-y += tests/
33

44
ifdef SHELLCHECK
5-
TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)
5+
SHELL_TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)
66
else
77
SHELL_TESTS :=
8-
TEST_LOGS :=
8+
SHELL_TEST_LOGS :=
99
endif
1010

1111
$(OUTPUT)%.shellcheck_log: %
1212
$(call rule_mkdir)
1313
$(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
1414

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

tools/perf/arch/x86/tests/Build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ perf-test-y += amd-ibs-via-core-pmu.o
1313

1414
ifdef SHELLCHECK
1515
SHELL_TESTS := gen-insn-x86-dat.sh
16-
TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)
16+
SHELL_TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)
1717
else
1818
SHELL_TESTS :=
19-
TEST_LOGS :=
19+
SHELL_TEST_LOGS :=
2020
endif
2121

2222
$(OUTPUT)%.shellcheck_log: %
2323
$(call rule_mkdir)
2424
$(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
2525

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

tools/perf/tests/Build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ perf-test-y += workloads/
8080

8181
ifdef SHELLCHECK
8282
SHELL_TESTS := $(shell find tests/shell -executable -type f -name '*.sh')
83-
TEST_LOGS := $(SHELL_TESTS:tests/shell/%=shell/%.shellcheck_log)
83+
SHELL_TEST_LOGS := $(SHELL_TESTS:tests/shell/%=shell/%.shellcheck_log)
8484
else
8585
SHELL_TESTS :=
86-
TEST_LOGS :=
86+
SHELL_TEST_LOGS :=
8787
endif
8888

8989
$(OUTPUT)%.shellcheck_log: %
9090
$(call rule_mkdir)
9191
$(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
9292

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

tools/perf/trace/beauty/Build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ perf-y += tracepoints/
2323

2424
ifdef SHELLCHECK
2525
SHELL_TESTS := $(wildcard trace/beauty/*.sh)
26-
TEST_LOGS := $(SHELL_TESTS:trace/beauty/%=%.shellcheck_log)
26+
SHELL_TEST_LOGS := $(SHELL_TESTS:trace/beauty/%=%.shellcheck_log)
2727
else
2828
SHELL_TESTS :=
29-
TEST_LOGS :=
29+
SHELL_TEST_LOGS :=
3030
endif
3131

3232
$(OUTPUT)%.shellcheck_log: %
3333
$(call rule_mkdir)
3434
$(Q)$(call echo-cmd,test)shellcheck -s bash -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
3535

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

tools/perf/util/Build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,14 +406,14 @@ $(OUTPUT)util/list_sort.o: ../lib/list_sort.c FORCE
406406

407407
ifdef SHELLCHECK
408408
SHELL_TESTS := generate-cmdlist.sh
409-
TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)
409+
SHELL_TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)
410410
else
411411
SHELL_TESTS :=
412-
TEST_LOGS :=
412+
SHELL_TEST_LOGS :=
413413
endif
414414

415415
$(OUTPUT)%.shellcheck_log: %
416416
$(call rule_mkdir)
417417
$(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ && rm $@ && false)
418418

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

0 commit comments

Comments
 (0)