tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

perf test: Move attr files into shell directory where they are used

Now the attr tests are shell tests move the associated python and
configuration files. Update the installation build rules for the new
directories. Recycle the lib install rules for python files allowing
the explicit attr.py install line to be dropped.

Signed-off-by: Ian Rogers <irogers@google.com>
Tested-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: zhaimingbing <zhaimingbing@cmss.chinamobile.com>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ze Gao <zegao2021@gmail.com>
Cc: Weilin Wang <weilin.wang@intel.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Veronika Molnarova <vmolnaro@redhat.com>
Link: https://lore.kernel.org/r/20241015000158.871828-4-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

authored by

Ian Rogers and committed by
Namhyung Kim 8296aa0f 3a447031

+3 -4
+2 -3
tools/perf/Makefile.perf
··· 1128 1128 install-tests: all install-gtk 1129 1129 $(call QUIET_INSTALL, tests) \ 1130 1130 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ 1131 - $(INSTALL) tests/attr.py -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ 1132 1131 $(INSTALL) tests/pe-file.exe* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ 1133 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ 1134 - $(INSTALL) tests/attr/* -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ 1135 1132 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ 1136 1133 $(INSTALL) tests/shell/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ 1134 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/attr'; \ 1135 + $(INSTALL) tests/shell/attr/* -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/attr'; \ 1137 1136 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ 1138 1137 $(INSTALL) tests/shell/lib/*.sh -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ 1139 1138 $(INSTALL) tests/shell/lib/*.py -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \
tools/perf/tests/attr.py tools/perf/tests/shell/lib/attr.py
tools/perf/tests/attr/README tools/perf/tests/shell/attr/README
tools/perf/tests/attr/base-record tools/perf/tests/shell/attr/base-record
tools/perf/tests/attr/base-record-spe tools/perf/tests/shell/attr/base-record-spe
tools/perf/tests/attr/base-stat tools/perf/tests/shell/attr/base-stat
tools/perf/tests/attr/system-wide-dummy tools/perf/tests/shell/attr/system-wide-dummy
tools/perf/tests/attr/test-record-C0 tools/perf/tests/shell/attr/test-record-C0
tools/perf/tests/attr/test-record-basic tools/perf/tests/shell/attr/test-record-basic
tools/perf/tests/attr/test-record-branch-any tools/perf/tests/shell/attr/test-record-branch-any
tools/perf/tests/attr/test-record-branch-filter-any tools/perf/tests/shell/attr/test-record-branch-filter-any
tools/perf/tests/attr/test-record-branch-filter-any_call tools/perf/tests/shell/attr/test-record-branch-filter-any_call
tools/perf/tests/attr/test-record-branch-filter-any_ret tools/perf/tests/shell/attr/test-record-branch-filter-any_ret
tools/perf/tests/attr/test-record-branch-filter-hv tools/perf/tests/shell/attr/test-record-branch-filter-hv
tools/perf/tests/attr/test-record-branch-filter-ind_call tools/perf/tests/shell/attr/test-record-branch-filter-ind_call
tools/perf/tests/attr/test-record-branch-filter-k tools/perf/tests/shell/attr/test-record-branch-filter-k
tools/perf/tests/attr/test-record-branch-filter-u tools/perf/tests/shell/attr/test-record-branch-filter-u
tools/perf/tests/attr/test-record-count tools/perf/tests/shell/attr/test-record-count
tools/perf/tests/attr/test-record-data tools/perf/tests/shell/attr/test-record-data
tools/perf/tests/attr/test-record-dummy-C0 tools/perf/tests/shell/attr/test-record-dummy-C0
tools/perf/tests/attr/test-record-freq tools/perf/tests/shell/attr/test-record-freq
tools/perf/tests/attr/test-record-graph-default tools/perf/tests/shell/attr/test-record-graph-default
tools/perf/tests/attr/test-record-graph-default-aarch64 tools/perf/tests/shell/attr/test-record-graph-default-aarch64
tools/perf/tests/attr/test-record-graph-dwarf tools/perf/tests/shell/attr/test-record-graph-dwarf
tools/perf/tests/attr/test-record-graph-fp tools/perf/tests/shell/attr/test-record-graph-fp
tools/perf/tests/attr/test-record-graph-fp-aarch64 tools/perf/tests/shell/attr/test-record-graph-fp-aarch64
tools/perf/tests/attr/test-record-group-sampling tools/perf/tests/shell/attr/test-record-group-sampling
tools/perf/tests/attr/test-record-group-sampling1 tools/perf/tests/shell/attr/test-record-group-sampling1
tools/perf/tests/attr/test-record-group-sampling2 tools/perf/tests/shell/attr/test-record-group-sampling2
tools/perf/tests/attr/test-record-group1 tools/perf/tests/shell/attr/test-record-group1
tools/perf/tests/attr/test-record-group2 tools/perf/tests/shell/attr/test-record-group2
tools/perf/tests/attr/test-record-group3 tools/perf/tests/shell/attr/test-record-group3
tools/perf/tests/attr/test-record-no-buffering tools/perf/tests/shell/attr/test-record-no-buffering
tools/perf/tests/attr/test-record-no-inherit tools/perf/tests/shell/attr/test-record-no-inherit
tools/perf/tests/attr/test-record-no-samples tools/perf/tests/shell/attr/test-record-no-samples
tools/perf/tests/attr/test-record-period tools/perf/tests/shell/attr/test-record-period
tools/perf/tests/attr/test-record-pfm-period tools/perf/tests/shell/attr/test-record-pfm-period
tools/perf/tests/attr/test-record-raw tools/perf/tests/shell/attr/test-record-raw
tools/perf/tests/attr/test-record-spe-period tools/perf/tests/shell/attr/test-record-spe-period
tools/perf/tests/attr/test-record-spe-period-term tools/perf/tests/shell/attr/test-record-spe-period-term
tools/perf/tests/attr/test-record-spe-physical-address tools/perf/tests/shell/attr/test-record-spe-physical-address
tools/perf/tests/attr/test-record-user-regs-no-sve-aarch64 tools/perf/tests/shell/attr/test-record-user-regs-no-sve-aarch64
tools/perf/tests/attr/test-record-user-regs-old-sve-aarch64 tools/perf/tests/shell/attr/test-record-user-regs-old-sve-aarch64
tools/perf/tests/attr/test-record-user-regs-sve-aarch64 tools/perf/tests/shell/attr/test-record-user-regs-sve-aarch64
tools/perf/tests/attr/test-stat-C0 tools/perf/tests/shell/attr/test-stat-C0
tools/perf/tests/attr/test-stat-basic tools/perf/tests/shell/attr/test-stat-basic
tools/perf/tests/attr/test-stat-default tools/perf/tests/shell/attr/test-stat-default
tools/perf/tests/attr/test-stat-detailed-1 tools/perf/tests/shell/attr/test-stat-detailed-1
tools/perf/tests/attr/test-stat-detailed-2 tools/perf/tests/shell/attr/test-stat-detailed-2
tools/perf/tests/attr/test-stat-detailed-3 tools/perf/tests/shell/attr/test-stat-detailed-3
tools/perf/tests/attr/test-stat-group1 tools/perf/tests/shell/attr/test-stat-group1
tools/perf/tests/attr/test-stat-no-inherit tools/perf/tests/shell/attr/test-stat-no-inherit
+1 -1
tools/perf/tests/shell/attr.sh
··· 17 17 18 18 shelldir=$(dirname "$0") 19 19 perf_path=$(which perf) 20 - python "${shelldir}"/../attr.py -d "${shelldir}"/../attr -v -p "$perf_path" 20 + python "${shelldir}"/lib/attr.py -d "${shelldir}"/attr -v -p "$perf_path" 21 21 cleanup 22 22 exit $err