From: Carsten Haitzler <carsten.haitzler@foss.arm.com>
To: Leo Yan <leo.yan@linaro.org>, Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Slaby <jirislaby@kernel.org>,
linux-kernel@vger.kernel.org, coresight@lists.linaro.org,
suzuki.poulose@arm.com, mathieu.poirier@linaro.org,
mike.leach@linaro.org, linux-perf-users@vger.kernel.org
Subject: Re: [PATCH v9 02/13] perf test: Add build infra for perf test tools for CoreSight tests
Date: Fri, 7 Oct 2022 12:34:51 +0100 [thread overview]
Message-ID: <e9f980a7-fba8-4610-a058-b74e51d6ab24@foss.arm.com> (raw)
In-Reply-To: <Yz7RAgMN6WGnD3OZ@leoy-yangtze.lan>
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@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:
>
> @@ -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?
next prev parent reply other threads:[~2022-10-07 11:35 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-09 15:27 [PATCH v9 00/13] perf: test: Add trace data quality tests for CoreSight carsten.haitzler
2022-09-09 15:27 ` [PATCH v9 01/13] perf test: Add CoreSight shell lib shared code for future tests carsten.haitzler
2022-09-09 15:27 ` [PATCH v9 02/13] perf test: Add build infra for perf test tools for CoreSight tests carsten.haitzler
2022-10-06 11:26 ` Arnaldo Carvalho de Melo
2022-10-06 11:45 ` Arnaldo Carvalho de Melo
2022-10-06 12:58 ` Leo Yan
2022-10-06 14:22 ` Arnaldo Carvalho de Melo
2022-10-06 15:07 ` Leo Yan
2022-10-06 17:12 ` Arnaldo Carvalho de Melo
2022-10-06 17:42 ` Arnaldo Carvalho de Melo
2022-10-07 6:28 ` Jiri Slaby
2022-10-07 11:34 ` Carsten Haitzler [this message]
2022-10-07 12:44 ` Arnaldo Carvalho de Melo
2022-10-10 7:02 ` Carsten Haitzler
2022-10-10 13:54 ` Arnaldo Carvalho de Melo
2022-10-19 8:11 ` Carsten Haitzler
2022-10-19 8:51 ` Leo Yan
2022-10-19 15:16 ` Arnaldo Carvalho de Melo
2022-09-09 15:27 ` [PATCH v9 03/13] perf test: Add asm pureloop test tool carsten.haitzler
2022-09-09 15:27 ` [PATCH v9 04/13] perf test: Add asm pureloop test shell script carsten.haitzler
2022-09-09 15:27 ` [PATCH v9 05/13] perf test: Add git ignore for perf data generated by the CoreSight tests carsten.haitzler
2022-09-09 15:27 ` [PATCH v9 06/13] perf test: Add memcpy thread test tool carsten.haitzler
2022-09-09 15:27 ` [PATCH v9 07/13] perf test: Add memcpy thread test shell script carsten.haitzler
2022-09-09 15:27 ` [PATCH v9 08/13] perf test: Add thread loop test tool carsten.haitzler
2022-09-09 15:27 ` [PATCH v9 09/13] perf test: Add thread loop test shell scripts carsten.haitzler
2022-09-09 15:28 ` [PATCH v9 10/13] perf test: Add unroll thread test tool carsten.haitzler
2022-09-09 15:28 ` [PATCH v9 11/13] perf test: Add unroll thread test shell script carsten.haitzler
2022-09-09 15:28 ` [PATCH v9 12/13] perf test: Add git ignore for tmp and output files of CoreSight tests carsten.haitzler
2022-09-09 15:28 ` [PATCH v9 13/13] perf test: Add relevant documentation about CoreSight testing carsten.haitzler
2022-10-11 7:27 ` Sven Schnelle
2022-10-19 8:16 ` Carsten Haitzler
2022-10-19 8:43 ` Leo Yan
2022-10-05 8:36 ` [PATCH v9 00/13] perf: test: Add trace data quality tests for CoreSight Carsten Haitzler
2022-10-05 18:35 ` Arnaldo Carvalho de Melo
2022-10-06 10:11 ` James Clark
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e9f980a7-fba8-4610-a058-b74e51d6ab24@foss.arm.com \
--to=carsten.haitzler@foss.arm.com \
--cc=acme@kernel.org \
--cc=coresight@lists.linaro.org \
--cc=jirislaby@kernel.org \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=suzuki.poulose@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).