Em Thu, Oct 06, 2022 at 08:58:42PM +0800, Leo Yan escreveu:
Hi Arnaldo,
On Thu, Oct 06, 2022 at 08:45:18AM -0300, Arnaldo Carvalho de Melo wrote:
Em Thu, Oct 06, 2022 at 08:26:00AM -0300, Arnaldo Carvalho de Melo escreveu:
Em Fri, Sep 09, 2022 at 04:27:52PM +0100, carsten.haitzler@foss.arm.com escreveu:
+all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS) tests-coresight-targets # Create python binding output directory if not already present _dummy := $(shell [ -d '$(OUTPUT)python' ] || mkdir -p '$(OUTPUT)python') @@ -1007,6 +1015,9 @@ install-tests: all install-gtk $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ $(INSTALL) tests/shell/lib/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ $(INSTALL) tests/shell/lib/*.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight'; \
$(INSTALL) tests/shell/coresight/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight'
- $(Q)$(MAKE) -C tests/shell/coresight install-tests
Added a missing ;\ on the line installing the *.py and adjusted use -m 644 for the .sh files to follow what was done in:
0a9eaf616f29ca32 ("perf tools: Don't install data files with x permissions")
@@ -1006,7 +1014,10 @@ install-tests: all install-gtk $(INSTALL) tests/shell/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ $(INSTALL) tests/shell/lib/*.sh -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \
$(INSTALL) tests/shell/lib/*.py -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'
$(INSTALL) tests/shell/lib/*.py -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight'; \
$(INSTALL) tests/shell/coresight/*.sh -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight'
$(Q)$(MAKE) -C tests/shell/coresight install-tests
Also had to remove:
$(INSTALL) tests/shell/coresight/*.sh -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight'
from this patch, as it makes install fail at this point in the patchset:
Thanks a lot!
James and me had found the merging conflict and planned to send out email for reminding it, the right change for above section would be:
Not at this patch, in this patch there are no tests/shell/coresight/*.sh which makes 'make install' to fail _at this point_, for bisectability we can't just test at the end of the patchkit.
@@ -1006,7 +1014,10 @@ install-tests: all install-gtk $(INSTALL) tests/shell/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ $(INSTALL) tests/shell/lib/*.sh -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \
$(INSTALL) tests/shell/lib/*.py -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'
$(INSTALL) tests/shell/lib/*.py -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight'; \
$(INSTALL) tests/shell/coresight/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight'
$(Q)$(MAKE) -C tests/shell/coresight install-tests
It's deliberately to not add '-m 644' when install coresight test shell scripts under the folder tests/shell/coresight/ so that we can keep the executable permission for these scripts. On the other flip, we set 644 mode for the scripts under tests/shell/lib/ so these scripts will not be executed directly by perf test framework.
@Carsten, if have chance could you confirm for above change?
If you need for some .sh, coresight test's to have x set while all of the others don't have, and you have a good reason for that, ok, we just add a comment.
DESCEND plugins GEN /tmp/build/perf/python/perf.so INSTALL trace_plugins INSTALL binaries INSTALL tests install: cannot stat 'tests/shell/coresight/*.sh': No such file or directory make[2]: *** [Makefile.perf:1007: install-tests] Error 1 make[2]: *** Waiting for unfinished jobs....
I'll add it back when the first .sh gets added to tests/shell/coresight/
Sorry for introducing extra efforts for you and thanks!
This also has to go, I'll check and fix this loop that doesn't follow the existing output style, happens with ´make install', etc too:
⬢[acme@toolbox perf]$ make -C tools/perf clean make: Entering directory '/var/home/acme/git/perf/tools/perf' CLEAN x86 CLEAN libtraceevent CLEAN libapi CLEAN libbpf CLEAN libsubcmd CLEAN libperf CLEAN fixdep CLEAN feature-detect CLEAN python CLEAN bpf-skel make -C asm_pure_loop clean >/dev/null <------------------- make -C memcpy_thread clean >/dev/null <------------------- make -C thread_loop clean >/dev/null <------------------- make -C unroll_loop_thread clean >/dev/null <------------------- CLEAN core-objs CLEAN core-progs CLEAN core-gen CLEAN Documentation make: Leaving directory '/var/home/acme/git/perf/tools/perf' ⬢[acme@toolbox perf]$