All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Wang Nan <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: wangnan0@huawei.com, lizefan@huawei.com, namhyung@kernel.org,
	acme@redhat.com, linux-kernel@vger.kernel.org,
	tglx@linutronix.de, mingo@kernel.org, jolsa@redhat.com,
	hpa@zytor.com
Subject: [tip:perf/urgent] perf build: Pass O option to kernel makefile in build-test
Date: Tue, 19 Jan 2016 05:35:52 -0800	[thread overview]
Message-ID: <tip-c15e758c4bd7fbe38983e36258541ffcf81e1500@git.kernel.org> (raw)
In-Reply-To: <1452830421-77757-5-git-send-email-wangnan0@huawei.com>

Commit-ID:  c15e758c4bd7fbe38983e36258541ffcf81e1500
Gitweb:     http://git.kernel.org/tip/c15e758c4bd7fbe38983e36258541ffcf81e1500
Author:     Wang Nan <wangnan0@huawei.com>
AuthorDate: Fri, 15 Jan 2016 04:00:16 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 15 Jan 2016 16:32:00 -0300

perf build: Pass O option to kernel makefile in build-test

Kernel makefile only follows an 'O' option passed from command line
explicitely. In build-test with 'O' option set, kernel makefile
contaminate kernel source directory. Build test also fail if we don't
create output directory manually.

K_O_OPT is added and passed to kernel makefile if 'O' is passed
to build-test.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1452830421-77757-5-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/tests/make | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 29810cf..f918015 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -22,6 +22,7 @@ ifneq ($(O),)
   ifeq ($(SET_O),1)
     O_OPT := 'O=$(FULL_O)'
   endif
+  K_O_OPT := 'O=$(FULL_O)'
 endif
 
 PARALLEL_OPT=
@@ -301,15 +302,15 @@ ifneq ($(O),)
 endif
 
 make_kernelsrc:
-	@echo "- make -C <kernelsrc> $(PARALLEL_OPT) tools/perf"
+	@echo "- make -C <kernelsrc> $(PARALLEL_OPT) $(K_O_OPT) tools/perf"
 	$(call clean); \
-	(make -C ../.. $(PARALLEL_OPT) tools/perf) > $@ 2>&1 && \
+	(make -C ../.. $(PARALLEL_OPT) $(K_O_OPT) tools/perf) > $@ 2>&1 && \
 	test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
 
 make_kernelsrc_tools:
-	@echo "- make -C <kernelsrc>/tools $(PARALLEL_OPT) perf"
+	@echo "- make -C <kernelsrc>/tools $(PARALLEL_OPT) $(K_O_OPT) perf"
 	$(call clean); \
-	(make -C ../../tools $(PARALLEL_OPT) perf) > $@ 2>&1 && \
+	(make -C ../../tools $(PARALLEL_OPT) $(K_O_OPT) perf) > $@ 2>&1 && \
 	test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
 
 all: $(run) $(run_O) tarpkg make_kernelsrc make_kernelsrc_tools

  reply	other threads:[~2016-01-19 13:36 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-15  4:00 [PATCH v3 0/9] perf build: Make build-test faster Wang Nan
2016-01-15  4:00 ` [PATCH v3 1/9] perf build: Set parallel making options build-test Wang Nan
2016-01-15  4:00 ` [PATCH v3 2/9] perf build: Pass O option to Makefile.perf in build-test Wang Nan
2016-01-19 13:35   ` [tip:perf/urgent] " tip-bot for Wang Nan
2016-01-15  4:00 ` [PATCH v3 3/9] perf build: Test correct path of perf " Wang Nan
2016-01-19 13:35   ` [tip:perf/urgent] " tip-bot for Wang Nan
2016-01-15  4:00 ` [PATCH v3 4/9] perf build: Pass O option to kernel makefile " Wang Nan
2016-01-19 13:35   ` tip-bot for Wang Nan [this message]
2016-01-15  4:00 ` [PATCH v3 5/9] perf build: Add feature-dump target Wang Nan
2016-01-15 19:11   ` Arnaldo Carvalho de Melo
2016-01-15 19:23     ` Arnaldo Carvalho de Melo
2016-01-15 19:27       ` Arnaldo Carvalho de Melo
2016-01-19 13:36   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2016-01-15  4:00 ` [PATCH v3 6/9] perf build: Introduce FEATURES_DUMP make variable Wang Nan
2016-01-19 13:36   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2016-01-15  4:00 ` [PATCH v3 7/9] tools build: Allow subprojects select all feature checkers Wang Nan
2016-01-15  4:00 ` [PATCH v3 8/9] perf build: Select all feature checkers for feature-dump Wang Nan
2016-01-15  4:00 ` [PATCH v3 9/9] perf build: Use feature dump file for build-test Wang Nan
2016-01-15 14:06   ` [PATCH v3 9/9 -fix] " Wang Nan
2016-01-15 14:08   ` [PATCH v3 9/9] " Wangnan (F)
2016-01-15 10:20 ` [PATCH v3 0/9] perf build: Make build-test faster Jiri Olsa
2016-01-15 14:36   ` Arnaldo Carvalho de Melo
2016-01-15 14:54     ` Arnaldo Carvalho de Melo
2016-01-15 14:54     ` pi3orama
2016-01-15 15:12       ` Arnaldo Carvalho de Melo
2016-01-15 16:33         ` Arnaldo Carvalho de Melo
2016-01-15 18:56           ` Arnaldo Carvalho de Melo
2016-01-15 19:01             ` Arnaldo Carvalho de Melo

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=tip-c15e758c4bd7fbe38983e36258541ffcf81e1500@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=wangnan0@huawei.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.