Re: [PATCH v2 3/9] perf build: Test correct path of perf in build-test

[Arnaldo Carvalho de Melo <acme@kernel.org>]

Em Thu, Jan 14, 2016 at 11:50:21AM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Thu, Jan 14, 2016 at 01:13:57PM +0000, Wang Nan escreveu:
> > If an 'O' is passed to 'make build-test', many 'test -x' and 'test -f'
> > will fail because perf resides in a different directory. Fix this by
> > computing PERF_OUT according to 'O' and test correct output files.
> > For make_kernelsrc and make_kernelsrc_tools, set KBUILD_OUTPUT_DIR
> > instead because the path is different from others ($(O)/perf vs
> >  $(O)/tools/perf).
> 
> So, before this patch:

Also, while trying to get this to work, I found these places lacking the
O= prefixing, right?


diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index e74c86b00c31..67842900482e 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -59,7 +59,7 @@ has = $(shell which $1 2>/dev/null)
 
 # standard single make variable specified
 make_clean_all      := clean all
-make_python_perf_so := python/perf.so
+make_python_perf_so := $(PERF_O)/python/perf.so
 make_debug          := DEBUG=1
 make_no_libperl     := NO_LIBPERL=1
 make_no_libpython   := NO_LIBPYTHON=1
@@ -82,9 +82,9 @@ make_tags           := tags
 make_cscope         := cscope
 make_help           := help
 make_doc            := doc
-make_perf_o           := perf.o
-make_util_map_o       := util/map.o
-make_util_pmu_bison_o := util/pmu-bison.o
+make_perf_o           := $(PERF_O)/perf.o
+make_util_map_o       := $(PERF_O)/util/map.o
+make_util_pmu_bison_o := $(PERF_O)/util/pmu-bison.o
 make_install        := install
 make_install_bin    := install-bin
 make_install_doc    := install-doc