perf build: Pass O option to kernel makefile in build-test (c15e758c) · Commits · 戴 / 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

+5 −4

Original line number	Diff line number	Diff line
		@@ -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

Admin message