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

perf tests: Factor make install tests 

Factoring make install tests to check for multiple files. Adding default
set of installed files for install and install_bin tests.

Putting the 'test' line into the log file instead to the screen as it
gets more complex now.

If the tests fails to find a file, following message is displayed:

$ make -f tests/make make_install_bin
- make_install_bin: cd . && make -f Makefile DESTDIR=/tmp/tmp.nCVuQoSHaJ install-bin
  failed to find: bin/perf

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1387460527-15030-2-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2013-12-19 14:41:59 +01:00 committed by Arnaldo Carvalho de Melo
parent b40067964f
commit ee4ad93e82
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tools/perf/tests/make
View File

@ -106,10 +106,36 @@ test_make_python_perf_so := test -f $(PERF)/python/perf.so
test_make_perf_o := test -f $(PERF)/perf.o test_make_perf_o := test -f $(PERF)/perf.o
test_make_util_map_o := test -f $(PERF)/util/map.o test_make_util_map_o := test -f $(PERF)/util/map.o
test_make_install := test -x $$TMP_DEST/bin/perf define test_dest_files
test_make_install_O := $(test_make_install) for file in $(1); do \
test_make_install_bin := $(test_make_install) if [ ! -x $$TMP_DEST/$$file ]; then \
test_make_install_bin_O := $(test_make_install) echo " failed to find: $$file"; \
fi \
done
endef
installed_files_bin := bin/perf
installed_files_bin += etc/bash_completion.d/perf
installed_files_bin += libexec/perf-core/perf-archive
installed_files_plugins := lib64/traceevent/plugins/plugin_cfg80211.so
installed_files_plugins += lib64/traceevent/plugins/plugin_scsi.so
installed_files_plugins += lib64/traceevent/plugins/plugin_xen.so
installed_files_plugins += lib64/traceevent/plugins/plugin_function.so
installed_files_plugins += lib64/traceevent/plugins/plugin_sched_switch.so
installed_files_plugins += lib64/traceevent/plugins/plugin_mac80211.so
installed_files_plugins += lib64/traceevent/plugins/plugin_kvm.so
installed_files_plugins += lib64/traceevent/plugins/plugin_kmem.so
installed_files_plugins += lib64/traceevent/plugins/plugin_hrtimer.so
installed_files_plugins += lib64/traceevent/plugins/plugin_jbd2.so
installed_files_all := $(installed_files_bin)
installed_files_all += $(installed_files_plugins)
test_make_install := $(call test_dest_files,$(installed_files_all))
test_make_install_O := $(call test_dest_files,$(installed_files_all))
test_make_install_bin := $(call test_dest_files,$(installed_files_bin))
test_make_install_bin_O := $(call test_dest_files,$(installed_files_bin))
# FIXME nothing gets installed # FIXME nothing gets installed
test_make_install_man := test -f $$TMP_DEST/share/man/man1/perf.1 test_make_install_man := test -f $$TMP_DEST/share/man/man1/perf.1
@ -162,7 +188,7 @@ $(run):
cmd="cd $(PERF) && make -f $(MK) DESTDIR=$$TMP_DEST $($@)"; \ cmd="cd $(PERF) && make -f $(MK) DESTDIR=$$TMP_DEST $($@)"; \
echo "- $@: $$cmd" && echo $$cmd > $@ && \ echo "- $@: $$cmd" && echo $$cmd > $@ && \
( eval $$cmd ) >> $@ 2>&1; \ ( eval $$cmd ) >> $@ 2>&1; \
echo " test: $(call test,$@)"; \ echo " test: $(call test,$@)" >> $@ 2>&1; \
$(call test,$@) && \ $(call test,$@) && \
rm -f $@ \ rm -f $@ \
rm -rf $$TMP_DEST rm -rf $$TMP_DEST
@ -174,7 +200,7 @@ $(run_O):
cmd="cd $(PERF) && make -f $(MK) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \ cmd="cd $(PERF) && make -f $(MK) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \
echo "- $@: $$cmd" && echo $$cmd > $@ && \ echo "- $@: $$cmd" && echo $$cmd > $@ && \
( eval $$cmd ) >> $@ 2>&1 && \ ( eval $$cmd ) >> $@ 2>&1 && \
echo " test: $(call test_O,$@)"; \ echo " test: $(call test_O,$@)" >> $@ 2>&1; \
$(call test_O,$@) && \ $(call test_O,$@) && \
rm -f $@ && \ rm -f $@ && \
rm -rf $$TMP_O \ rm -rf $$TMP_O \