Re: [PATCH 2/9] perf build: Pass O option to Makefile.perf in build-test

pi3orama
2016-01-14T15:20:44Z

发自我的 iPhone

> 在 2016年1月14日，下午10:37，Jiri Olsa <jolsa@redhat.com> 写道：
>
>> On Thu, Jan 14, 2016 at 11:28:23AM -0300, Arnaldo Carvalho de Melo wrote:
>> Em Thu, Jan 14, 2016 at 05:56:06PM +0800, Wangnan (F) escreveu:
>>>
>>>
>>>> On 2016/1/14 17:32, Jiri Olsa wrote:
>>>>> On Wed, Jan 13, 2016 at 12:17:15PM +0000, Wang Nan wrote:
>>>>> Doesn't like tools/perf/Makefile, tools/perf/Makefile.perf obey 'O'
>>>>> option when it is passed through cmdline only, because of code in
>>>>> tools/scripts/Makefile.include:
>>>>>
>>>>> ifneq ($(O),)
>>>>> ifeq ($(origin O), command line)
>>>>> ...
>>>>> ABSOLUTE_O := $(shell cd $(O) ; pwd)
>>>>> OUTPUT := $(ABSOLUTE_O)/$(if $(subdir),$(subdir)/)
>>>>> endif
>>>>> endif
>>>>>
>>>>> This patch passes 'O' to Makefile.perf through cmdline explicitly
>>>>> to make it follow O variable during build-test.
>>>>>
>>>>> Signed-off-by: Wang Nan <wangnan0@huawei.com>
>>>>> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
>>>>> Cc: Jiri Olsa <jolsa@kernel.org>
>>>>> Cc: Namhyung Kim <namhyung@kernel.org>
>>>>> ---
>>>>> tools/perf/tests/make | 12 ++++++++++--
>>>>> 1 file changed, 10 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/tools/perf/tests/make b/tools/perf/tests/make
>>>>> index c0ee679..14d7b8d 100644
>>>>> --- a/tools/perf/tests/make
>>>>> +++ b/tools/perf/tests/make
>>>>> @@ -5,7 +5,7 @@ ifeq ($(MAKECMDGOALS),)
>>>>> # no target specified, trigger the whole suite
>>>>> all:
>>>>> @echo "Testing Makefile"; $(MAKE) -sf tests/make MK=Makefile
>>>>> - @echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf SET_PARALLEL=1
>>>>> + @echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf SET_PARALLEL=1 SET_O=1
>>>>> else
>>>>> # run only specific test over 'Makefile'
>>>>> %:
>>>>> @@ -13,6 +13,14 @@ else
>>>>> endif
>>>>> else
>>>>> PERF := .
>>>>> +O_OPT :=
>>>>> +
>>>>> +ifneq ($(O),)
>>>>> + FULL_O := $(shell readlink -f $(O) || echo $(O))
>>>>> + ifeq ($(SET_O),1)
>>>>> + O_OPT := 'O=$(FULL_O)'
>>>>> + endif
>>>>> +endif
>>>>> PARALLEL_OPT=
>>>>> ifeq ($(SET_PARALLEL),1)
>>>>> @@ -261,7 +269,7 @@ clean := @(cd $(PERF); make -s -f $(MK) clean >/dev/null)
>>>>> $(run):
>>>>> $(call clean)
>>>>> @TMP_DEST=$$(mktemp -d); \
>>>>> - cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) DESTDIR=$$TMP_DEST $($@)"; \
>>>>> + cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) $(O_OPT) DESTDIR=$$TMP_DEST $($@)"; \
>>>> hum, but this set is to test make without O=... so why would you set it?
>>>> run_O is the target for O=... tests
>>>
>>> I have strong motivation to avoid polluting source directory.
>>
>> yeah!
>
> heh, I knew you'd be excited ;-) but does that actually mean
> that build-test will never run tests in source directory?
>

build-test should be able to run at source
directory, and I try to not passing extra
O option to make in this situation. This is the
reason why I choose to use O_OPT instead
of directly adding O=xxx to make command.

I tested all cases (with and without -O),
in and out of source directory (for v1. For v2
I remove some test cases). It should work.

Thank you.