From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 673FEC433F5 for ; Fri, 7 Oct 2022 11:35:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229751AbiJGLfG (ORCPT ); Fri, 7 Oct 2022 07:35:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229732AbiJGLfD (ORCPT ); Fri, 7 Oct 2022 07:35:03 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C1DB525C66; Fri, 7 Oct 2022 04:34:54 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 888FC1063; Fri, 7 Oct 2022 04:35:00 -0700 (PDT) Received: from [192.168.99.12] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 00C143F792; Fri, 7 Oct 2022 04:34:52 -0700 (PDT) Message-ID: Date: Fri, 7 Oct 2022 12:34:51 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.0 Subject: Re: [PATCH v9 02/13] perf test: Add build infra for perf test tools for CoreSight tests To: Leo Yan , Arnaldo Carvalho de Melo Cc: Jiri Slaby , 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 References: <20220909152803.2317006-1-carsten.haitzler@foss.arm.com> <20220909152803.2317006-3-carsten.haitzler@foss.arm.com> Content-Language: en-US From: Carsten Haitzler Organization: Arm Ltd. In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org 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?