UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf tools: Add a build-test variant to use in builds from a tarball 

To use in automated tests inside containers from a tarball generated
by 'make perf-tar-src-pkg*', where testing building from a tarball
is obviously not needed, so add a 'build-test-tarball' for that case.

And don't build with gtk2 as this complicates things for cross builds
where we don't always have all the libraries a full perf build requires
available for the target arch, ditto for static builds.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2021-04-15 21:15:34 -03:00
parent 59a1a843b0
commit bb7db8699b
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/perf/Makefile
View File

@ -100,7 +100,10 @@ clean:
# make -C tools/perf -f tests/make # make -C tools/perf -f tests/make
# #
build-test: build-test:
@$(MAKE) SHUF=1 -f tests/make REUSE_FEATURES_DUMP=1 MK=Makefile SET_PARALLEL=1 --no-print-directory tarpkg out @$(MAKE) SHUF=1 -f tests/make REUSE_FEATURES_DUMP=1 MK=Makefile SET_PARALLEL=1 --no-print-directory tarpkg make_static make_with_gtk2 out
build-test-tarball:
@$(MAKE) -f tests/make REUSE_FEATURES_DUMP=1 MK=Makefile SET_PARALLEL=1 --no-print-directory out
# #
# All other targets get passed through: # All other targets get passed through:

22
tools/perf/tests/make
View File

@ -155,7 +155,6 @@ run += make_no_syscall_tbl
run += make_with_babeltrace run += make_with_babeltrace
run += make_with_clangllvm run += make_with_clangllvm
run += make_with_libpfm4 run += make_with_libpfm4
run += make_with_gtk2
run += make_help run += make_help
run += make_doc run += make_doc
run += make_perf_o run += make_perf_o
@ -172,7 +171,6 @@ run += make_install_prefix_slash
# run += make_install_info # run += make_install_info
# run += make_install_pdf # run += make_install_pdf
run += make_minimal run += make_minimal
run += make_static
ifneq ($(call has,ctags),) ifneq ($(call has,ctags),)
run += make_tags run += make_tags
@ -307,6 +305,26 @@ $(run):
$(call test,$@) && \ $(call test,$@) && \
rm -rf $@ $$TMP_DEST || (cat $@ ; false) rm -rf $@ $$TMP_DEST || (cat $@ ; false)
make_with_gtk2:
$(call clean)
@TMP_DEST=$$(mktemp -d); \
cmd="cd $(PERF) && $(MAKE_F) $($@) $(PARALLEL_OPT) $(O_OPT) DESTDIR=$$TMP_DEST"; \
printf "%*.*s: %s\n" $(max_width) $(max_width) "$@" "$$cmd" && echo $$cmd > $@ && \
( eval $$cmd ) >> $@ 2>&1; \
echo " test: $(call test,$@)" >> $@ 2>&1; \
$(call test,$@) && \
rm -rf $@ $$TMP_DEST || (cat $@ ; false)
make_static:
$(call clean)
@TMP_DEST=$$(mktemp -d); \
cmd="cd $(PERF) && $(MAKE_F) $($@) $(PARALLEL_OPT) $(O_OPT) DESTDIR=$$TMP_DEST"; \
printf "%*.*s: %s\n" $(max_width) $(max_width) "$@" "$$cmd" && echo $$cmd > $@ && \
( eval $$cmd ) >> $@ 2>&1; \
echo " test: $(call test,$@)" >> $@ 2>&1; \
$(call test,$@) && \
rm -rf $@ $$TMP_DEST || (cat $@ ; false)
$(run_O): $(run_O):
$(call clean) $(call clean)
@TMP_O=$$(mktemp -d); \ @TMP_O=$$(mktemp -d); \