mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 05:01:48 +00:00
perf build: Test correct path of perf in build-test
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). 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-4-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
eb807730c0
commit
68824de19a
@ -13,10 +13,12 @@ else
|
|||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
PERF := .
|
PERF := .
|
||||||
|
PERF_O := $(PERF)
|
||||||
O_OPT :=
|
O_OPT :=
|
||||||
|
|
||||||
ifneq ($(O),)
|
ifneq ($(O),)
|
||||||
FULL_O := $(shell readlink -f $(O) || echo $(O))
|
FULL_O := $(shell readlink -f $(O) || echo $(O))
|
||||||
|
PERF_O := $(FULL_O)
|
||||||
ifeq ($(SET_O),1)
|
ifeq ($(SET_O),1)
|
||||||
O_OPT := 'O=$(FULL_O)'
|
O_OPT := 'O=$(FULL_O)'
|
||||||
endif
|
endif
|
||||||
@ -173,11 +175,11 @@ test_make_doc := $(test_ok)
|
|||||||
test_make_help_O := $(test_ok)
|
test_make_help_O := $(test_ok)
|
||||||
test_make_doc_O := $(test_ok)
|
test_make_doc_O := $(test_ok)
|
||||||
|
|
||||||
test_make_python_perf_so := test -f $(PERF)/python/perf.so
|
test_make_python_perf_so := test -f $(PERF_O)/python/perf.so
|
||||||
|
|
||||||
test_make_perf_o := test -f $(PERF)/perf.o
|
test_make_perf_o := test -f $(PERF_O)/perf.o
|
||||||
test_make_util_map_o := test -f $(PERF)/util/map.o
|
test_make_util_map_o := test -f $(PERF_O)/util/map.o
|
||||||
test_make_util_pmu_bison_o := test -f $(PERF)/util/pmu-bison.o
|
test_make_util_pmu_bison_o := test -f $(PERF_O)/util/pmu-bison.o
|
||||||
|
|
||||||
define test_dest_files
|
define test_dest_files
|
||||||
for file in $(1); do \
|
for file in $(1); do \
|
||||||
@ -244,7 +246,7 @@ test_make_perf_o_O := test -f $$TMP_O/perf.o
|
|||||||
test_make_util_map_o_O := test -f $$TMP_O/util/map.o
|
test_make_util_map_o_O := test -f $$TMP_O/util/map.o
|
||||||
test_make_util_pmu_bison_o_O := test -f $$TMP_O/util/pmu-bison.o
|
test_make_util_pmu_bison_o_O := test -f $$TMP_O/util/pmu-bison.o
|
||||||
|
|
||||||
test_default = test -x $(PERF)/perf
|
test_default = test -x $(PERF_O)/perf
|
||||||
test = $(if $(test_$1),$(test_$1),$(test_default))
|
test = $(if $(test_$1),$(test_$1),$(test_default))
|
||||||
|
|
||||||
test_default_O = test -x $$TMP_O/perf
|
test_default_O = test -x $$TMP_O/perf
|
||||||
@ -293,17 +295,22 @@ tarpkg:
|
|||||||
( eval $$cmd ) >> $@ 2>&1 && \
|
( eval $$cmd ) >> $@ 2>&1 && \
|
||||||
rm -f $@
|
rm -f $@
|
||||||
|
|
||||||
|
KERNEL_O := ../..
|
||||||
|
ifneq ($(O),)
|
||||||
|
KERNEL_O := $(O)
|
||||||
|
endif
|
||||||
|
|
||||||
make_kernelsrc:
|
make_kernelsrc:
|
||||||
@echo "- make -C <kernelsrc> $(PARALLEL_OPT) tools/perf"
|
@echo "- make -C <kernelsrc> $(PARALLEL_OPT) tools/perf"
|
||||||
$(call clean); \
|
$(call clean); \
|
||||||
(make -C ../.. $(PARALLEL_OPT) tools/perf) > $@ 2>&1 && \
|
(make -C ../.. $(PARALLEL_OPT) tools/perf) > $@ 2>&1 && \
|
||||||
test -x perf && rm -f $@ || (cat $@ ; false)
|
test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
|
||||||
|
|
||||||
make_kernelsrc_tools:
|
make_kernelsrc_tools:
|
||||||
@echo "- make -C <kernelsrc>/tools $(PARALLEL_OPT) perf"
|
@echo "- make -C <kernelsrc>/tools $(PARALLEL_OPT) perf"
|
||||||
$(call clean); \
|
$(call clean); \
|
||||||
(make -C ../../tools $(PARALLEL_OPT) perf) > $@ 2>&1 && \
|
(make -C ../../tools $(PARALLEL_OPT) perf) > $@ 2>&1 && \
|
||||||
test -x perf && rm -f $@ || (cat $@ ; false)
|
test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
|
||||||
|
|
||||||
all: $(run) $(run_O) tarpkg make_kernelsrc make_kernelsrc_tools
|
all: $(run) $(run_O) tarpkg make_kernelsrc make_kernelsrc_tools
|
||||||
@echo OK
|
@echo OK
|
||||||
|
Loading…
Reference in New Issue
Block a user