Re: [PATCH v9 02/13] perf test: Add build infra for perf test tools for CoreSight tests

[Carsten Haitzler]

On 10/6/22 13:58, Leo Yan wrote:
> 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@xxxxxxxxxxxx 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:
>
> @@ -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?
>
> >    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!

oh sorry - indeed i didn't see this problem coming after fixing the 
conflicts. i've got an update of the patches that fix that. should i 
just send through the 2 updates patches as a v10 or the whole series?