perf tests: Add install tests to tests/make
cover perf tests: Add install tests to tests/make
hi,
adding build tests for 'install*' targets and check for ctags/cscope binaries.
I noticed that besides plain 'install' target following are either broken or do not install a single file:
install-doc
install-man
install-html
install-info
install-pdf
Complete description is in patch 5 changelog.
I guess we want all those targets functional the same way as the main 'Documentation' stuff.
thanks,
jirka
---
Jiri Olsa (5):
perf tests: Run ctags/cscope make tests only with needed binaries perf tests: Rename TMP to TMP_O tests/make variable perf tests: Add DESTDIR=TMP_DEST tests/make variable perf tests: Add 'make install/install-bin' tests into tests/make perf tests: Add broken install-* tests into tests/make
tools/perf/tests/make | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 59 insertions(+), 8 deletions(-)
PATCH 1/5 perf tests: Run ctags/cscope make tests only with needed binaries
Running tags and cscope make tests only if the 'ctags' and 'cscope' binaries are installed, so we don't have false alarm test failures.
--- tools/perf/tests/make | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
tools/perf/tests/make +9 -2
@@ -1,6 +1,8 @@ PERF := . MK := Makefile +has = $(shell which $1 2>/dev/null) + # standard single make variable specified make_clean_all := clean all make_python_perf_so := python/perf.so
@@ -50,14 +52,19 @@ run += make_no_backtrace run += make_no_libnuma run += make_no_libaudit run += make_no_libbionic -run += make_tags -run += make_cscope run += make_help run += make_doc run += make_perf_o run += make_util_map_o run += make_minimal +ifneq ($(call has,ctags),) +run += make_tags +endif +ifneq ($(call has,cscope),) +run += make_cscope +endif + # $(run_O) contains same portion of $(run) tests with '_O' attached # to distinguish O=... tests run_O := $(addsuffix _O,$(run))
Signature · 1 line
1.7.11.7
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf tests: Run ctags/ cscope make tests only with needed binaries
perf tests: Run ctags/cscope make tests only with needed binaries
Commit-ID: 0659e66981ab137c11a746899672c886e1973a7b Gitweb: http://git.kernel.org/tip/0659e66981ab137c11a746899672c886e1973a7b Author: Jiri Olsa <[email protected]> AuthorDate: Mon, 22 Jul 2013 14:43:30 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 22 Jul 2013 15:35:03 -0300
perf tests: Run ctags/cscope make tests only with needed binaries
Running tags and cscope make tests only if the 'ctags' and 'cscope' binaries are installed, so we don't have false alarm test failures.
--- tools/perf/tests/make | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
tools/perf/tests/make +9 -2
@@ -1,6 +1,8 @@ PERF := . MK := Makefile +has = $(shell which $1 2>/dev/null) + # standard single make variable specified make_clean_all := clean all make_python_perf_so := python/perf.so
@@ -50,14 +52,19 @@ run += make_no_backtrace run += make_no_libnuma run += make_no_libaudit run += make_no_libbionic -run += make_tags -run += make_cscope run += make_help run += make_doc run += make_perf_o run += make_util_map_o run += make_minimal +ifneq ($(call has,ctags),) +run += make_tags +endif +ifneq ($(call has,cscope),) +run += make_cscope +endif + # $(run_O) contains same portion of $(run) tests with '_O' attached # to distinguish O=... tests run_O := $(addsuffix _O,$(run))
PATCH 2/5 perf tests: Rename TMP to TMP_O tests/make variable
In reply to Jiri OlsaRenaming TMP to TMP_O tests/make variable to make a name space for other temp variables.
--- tools/perf/tests/make | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/tests/make +4 -4
@@ -102,7 +102,7 @@ test_make_util_map_o_O := true test_default = test -x $(PERF)/perf test = $(if $(test_$1),$(test_$1),$(test_default)) -test_default_O = test -x $$TMP/perf +test_default_O = test -x $$TMP_O/perf test_O = $(if $(test_$1),$(test_$1),$(test_default_O)) all:
@@ -127,14 +127,14 @@ $(run): $(run_O): $(call clean) - @TMP=$$(mktemp -d); \ - cmd="cd $(PERF) && make -f $(MK) $($(patsubst %_O,%,$@)) O=$$TMP"; \ + @TMP_O=$$(mktemp -d); \ + cmd="cd $(PERF) && make -f $(MK) $($(patsubst %_O,%,$@)) O=$$TMP_O"; \ echo "- $@: $$cmd" && echo $$cmd > $@ && \ ( eval $$cmd ) >> $@ 2>&1 && \ echo " test: $(call test_O,$@)"; \ $(call test_O,$@) && \ rm -f $@ && \ - rm -rf $$TMP + rm -rf $$TMP_O all: $(run) $(run_O) @echo OK
Signature · 1 line
1.7.11.7
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf tests: Rename TMP to TMP_O tests/ make variable
perf tests: Rename TMP to TMP_O tests/make variable
Commit-ID: 8ba7cdea321d4d5bb53ac210f4e0a4bca5b0dba5 Gitweb: http://git.kernel.org/tip/8ba7cdea321d4d5bb53ac210f4e0a4bca5b0dba5 Author: Jiri Olsa <[email protected]> AuthorDate: Mon, 22 Jul 2013 14:43:31 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 22 Jul 2013 15:36:19 -0300
perf tests: Rename TMP to TMP_O tests/make variable
Renaming TMP to TMP_O tests/make variable to make a name space for other temp variables.
--- tools/perf/tests/make | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/tests/make +4 -4
@@ -102,7 +102,7 @@ test_make_util_map_o_O := true test_default = test -x $(PERF)/perf test = $(if $(test_$1),$(test_$1),$(test_default)) -test_default_O = test -x $$TMP/perf +test_default_O = test -x $$TMP_O/perf test_O = $(if $(test_$1),$(test_$1),$(test_default_O)) all:
@@ -127,14 +127,14 @@ $(run): $(run_O): $(call clean) - @TMP=$$(mktemp -d); \ - cmd="cd $(PERF) && make -f $(MK) $($(patsubst %_O,%,$@)) O=$$TMP"; \ + @TMP_O=$$(mktemp -d); \ + cmd="cd $(PERF) && make -f $(MK) $($(patsubst %_O,%,$@)) O=$$TMP_O"; \ echo "- $@: $$cmd" && echo $$cmd > $@ && \ ( eval $$cmd ) >> $@ 2>&1 && \ echo " test: $(call test_O,$@)"; \ $(call test_O,$@) && \ rm -f $@ && \ - rm -rf $$TMP + rm -rf $$TMP_O all: $(run) $(run_O) @echo OK
PATCH 3/5 perf tests: Add DESTDIR=TMP_DEST tests/make variable
In reply to Jiri OlsaAdding TMP_DEST tests/make variable to provide the DESTDIR directory for installation tests.
Adding this to existing test targets, since DESTDIR variable 'should not' affect other than install* targets. We can always separate this if there's a need for DESTDIR-free build test.
--- tools/perf/tests/make | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
tools/perf/tests/make +8 -4
@@ -118,23 +118,27 @@ clean := @(cd $(PERF); make -s -f $(MK) clean >/dev/null) $(run): $(call clean) - @cmd="cd $(PERF) && make -f $(MK) $($@)"; \ + @TMP_DEST=$$(mktemp -d); \ + cmd="cd $(PERF) && make -f $(MK) DESTDIR=$$TMP_DEST $($@)"; \ echo "- $@: $$cmd" && echo $$cmd > $@ && \ ( eval $$cmd ) >> $@ 2>&1; \ echo " test: $(call test,$@)"; \ $(call test,$@) && \ - rm -f $@ + rm -f $@ \ + rm -rf $$TMP_DEST $(run_O): $(call clean) @TMP_O=$$(mktemp -d); \ - cmd="cd $(PERF) && make -f $(MK) $($(patsubst %_O,%,$@)) O=$$TMP_O"; \ + TMP_DEST=$$(mktemp -d); \ + cmd="cd $(PERF) && make -f $(MK) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \ echo "- $@: $$cmd" && echo $$cmd > $@ && \ ( eval $$cmd ) >> $@ 2>&1 && \ echo " test: $(call test_O,$@)"; \ $(call test_O,$@) && \ rm -f $@ && \ - rm -rf $$TMP_O + rm -rf $$TMP_O \ + rm -rf $$TMP_DEST all: $(run) $(run_O) @echo OK
Signature · 1 line
1.7.11.7
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf tests: Add DESTDIR=TMP_DEST tests/ make variable
perf tests: Add DESTDIR=TMP_DEST tests/make variable
Commit-ID: c9311674e73345d4d02595c80d43f4bcf9ff3a3f Gitweb: http://git.kernel.org/tip/c9311674e73345d4d02595c80d43f4bcf9ff3a3f Author: Jiri Olsa <[email protected]> AuthorDate: Mon, 22 Jul 2013 14:43:32 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 22 Jul 2013 16:52:50 -0300
perf tests: Add DESTDIR=TMP_DEST tests/make variable
Adding TMP_DEST tests/make variable to provide the DESTDIR directory for installation tests.
Adding this to existing test targets, since DESTDIR variable 'should not' affect other than install* targets. We can always separate this if there's a need for DESTDIR-free build test.
--- tools/perf/tests/make | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
tools/perf/tests/make +8 -4
@@ -118,23 +118,27 @@ clean := @(cd $(PERF); make -s -f $(MK) clean >/dev/null) $(run): $(call clean) - @cmd="cd $(PERF) && make -f $(MK) $($@)"; \ + @TMP_DEST=$$(mktemp -d); \ + cmd="cd $(PERF) && make -f $(MK) DESTDIR=$$TMP_DEST $($@)"; \ echo "- $@: $$cmd" && echo $$cmd > $@ && \ ( eval $$cmd ) >> $@ 2>&1; \ echo " test: $(call test,$@)"; \ $(call test,$@) && \ - rm -f $@ + rm -f $@ \ + rm -rf $$TMP_DEST $(run_O): $(call clean) @TMP_O=$$(mktemp -d); \ - cmd="cd $(PERF) && make -f $(MK) $($(patsubst %_O,%,$@)) O=$$TMP_O"; \ + TMP_DEST=$$(mktemp -d); \ + cmd="cd $(PERF) && make -f $(MK) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \ echo "- $@: $$cmd" && echo $$cmd > $@ && \ ( eval $$cmd ) >> $@ 2>&1 && \ echo " test: $(call test_O,$@)"; \ $(call test_O,$@) && \ rm -f $@ && \ - rm -rf $$TMP_O + rm -rf $$TMP_O \ + rm -rf $$TMP_DEST all: $(run) $(run_O) @echo OK
PATCH 4/5 perf tests: Add 'make install/install-bin' tests into tests/make
In reply to Jiri OlsaAdding 'make install' and 'make install-bin' tests into tests/make. It's run as part of the suite, but could be run separately like:
$ make -f tests/make make_install
- make_install: cd . && make -f Makefile DESTDIR=/tmp/tmp.LpkYbk5pfs install
test: test -x /tmp/tmp.LpkYbk5pfs/bin/perf
$ make -f tests/make make_install_bin
- make_install_bin: cd . && make -f Makefile DESTDIR=/tmp/tmp.dMxePBMcFT
install-bin
test: test -x /tmp/tmp.dMxePBMcFT/bin/perf--- tools/perf/tests/make | 9 +++++++++ 1 file changed, 9 insertions(+)
tools/perf/tests/make +9 -0
@@ -27,6 +27,8 @@ make_help := help make_doc := doc make_perf_o := perf.o make_util_map_o := util/map.o +make_install := install +make_install_bin := install-bin # all the NO_* variable combined make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
@@ -56,6 +58,8 @@ run += make_help run += make_doc run += make_perf_o run += make_util_map_o +run += make_install +run += make_install_bin run += make_minimal ifneq ($(call has,ctags),)
@@ -91,6 +95,11 @@ test_make_python_perf_so := test -f $(PERF)/python/perf.so test_make_perf_o := test -f $(PERF)/perf.o test_make_util_map_o := test -f $(PERF)/util/map.o +test_make_install := test -x $$TMP_DEST/bin/perf +test_make_install_O := $(test_make_install) +test_make_install_bin := $(test_make_install) +test_make_install_bin_O := $(test_make_install) + # Kbuild tests only #test_make_python_perf_so_O := test -f $$TMP/tools/perf/python/perf.so #test_make_perf_o_O := test -f $$TMP/tools/perf/perf.o
Signature · 1 line
1.7.11.7
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf tests: Add 'make install/install-bin' tests into tests/make
perf tests: Add 'make install/install-bin' tests into tests/make
Commit-ID: c0ec11088800e1a5efbccc291a42580727798123 Gitweb: http://git.kernel.org/tip/c0ec11088800e1a5efbccc291a42580727798123 Author: Jiri Olsa <[email protected]> AuthorDate: Mon, 22 Jul 2013 14:43:33 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 22 Jul 2013 16:54:06 -0300
perf tests: Add 'make install/install-bin' tests into tests/make
Adding 'make install' and 'make install-bin' tests into tests/make. It's run as part of the suite, but could be run separately like:
$ make -f tests/make make_install
- make_install: cd . && make -f Makefile DESTDIR=/tmp/tmp.LpkYbk5pfs install
test: test -x /tmp/tmp.LpkYbk5pfs/bin/perf
$ make -f tests/make make_install_bin
- make_install_bin: cd . && make -f Makefile DESTDIR=/tmp/tmp.dMxePBMcFT
install-bin
test: test -x /tmp/tmp.dMxePBMcFT/bin/perf--- tools/perf/tests/make | 9 +++++++++ 1 file changed, 9 insertions(+)
tools/perf/tests/make +9 -0
@@ -27,6 +27,8 @@ make_help := help make_doc := doc make_perf_o := perf.o make_util_map_o := util/map.o +make_install := install +make_install_bin := install-bin # all the NO_* variable combined make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
@@ -56,6 +58,8 @@ run += make_help run += make_doc run += make_perf_o run += make_util_map_o +run += make_install +run += make_install_bin run += make_minimal ifneq ($(call has,ctags),)
@@ -91,6 +95,11 @@ test_make_python_perf_so := test -f $(PERF)/python/perf.so test_make_perf_o := test -f $(PERF)/perf.o test_make_util_map_o := test -f $(PERF)/util/map.o +test_make_install := test -x $$TMP_DEST/bin/perf +test_make_install_O := $(test_make_install) +test_make_install_bin := $(test_make_install) +test_make_install_bin_O := $(test_make_install) + # Kbuild tests only #test_make_python_perf_so_O := test -f $$TMP/tools/perf/python/perf.so #test_make_perf_o_O := test -f $$TMP/tools/perf/perf.o
PATCH 5/5 perf tests: Add broken install-* tests into tests/make
In reply to Jiri OlsaAdding install-* tests into tests/make. Those tests are broken, so commenting them out right away.
* Nothing get installed for install-man, install_doc and install_html targets, they just rebuild the documentation.
* I've got following error for 'install-info':
$ make -f tests/make make_install_info - make_install_info: cd . && make -f Makefile DESTDIR=/tmp/tmp.Xi4mb9J1a0 install-info
$ tail -f make_install_info ... PERF_VERSION = 3.11.rc1.g9b3c2d make[2]: *** No rule to make target `user-manual.xml', needed by `user-manual.texi'. Stop. make[1]: *** [install-info] Error 2
* I've got following error for 'install-pdf':
$ make -f tests/make make_install_pdf - make_install_pdf: cd . && make -f Makefile DESTDIR=/tmp/tmp.fXseECBbt1 install-pdf
$ tail -f make_install_pdf ... PERF_VERSION = 3.11.rc1.g9b3c2d make[2]: *** No rule to make target `user-manual.xml', needed by `user-manual.pdf'. Stop. make[1]: *** [install-pdf] Error 2
--- tools/perf/tests/make | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
tools/perf/tests/make +31 -0
@@ -29,6 +29,11 @@ make_perf_o := perf.o make_util_map_o := util/map.o make_install := install make_install_bin := install-bin +make_install_doc := install-doc +make_install_man := install-man +make_install_html := install-html +make_install_info := install-info +make_install_pdf := install-pdf # all the NO_* variable combined make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
@@ -60,6 +65,12 @@ run += make_perf_o run += make_util_map_o run += make_install run += make_install_bin +# FIXME 'install-*' commented out till they're fixed +# run += make_install_doc +# run += make_install_man +# run += make_install_html +# run += make_install_info +# run += make_install_pdf run += make_minimal ifneq ($(call has,ctags),)
@@ -100,6 +111,26 @@ test_make_install_O := $(test_make_install) test_make_install_bin := $(test_make_install) test_make_install_bin_O := $(test_make_install) +# FIXME nothing gets installed +test_make_install_man := test -f $$TMP_DEST/share/man/man1/perf.1 +test_make_install_man_O := $(test_make_install_man) + +# FIXME nothing gets installed +test_make_install_doc := $(test_ok) +test_make_install_doc_O := $(test_ok) + +# FIXME nothing gets installed +test_make_install_html := $(test_ok) +test_make_install_html_O := $(test_ok) + +# FIXME nothing gets installed +test_make_install_info := $(test_ok) +test_make_install_info_O := $(test_ok) + +# FIXME nothing gets installed +test_make_install_pdf := $(test_ok) +test_make_install_pdf_O := $(test_ok) + # Kbuild tests only #test_make_python_perf_so_O := test -f $$TMP/tools/perf/python/perf.so #test_make_perf_o_O := test -f $$TMP/tools/perf/perf.o
Signature · 1 line
1.7.11.7
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf tests: Add broken install-* tests into tests /make
perf tests: Add broken install-* tests into tests/make
Commit-ID: dbad41893c7941f3c53805f8206993719f971bfa Gitweb: http://git.kernel.org/tip/dbad41893c7941f3c53805f8206993719f971bfa Author: Jiri Olsa <[email protected]> AuthorDate: Mon, 22 Jul 2013 14:43:34 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 22 Jul 2013 16:54:56 -0300
perf tests: Add broken install-* tests into tests/make
Adding install-* tests into tests/make. Those tests are broken, so commenting them out right away.
* Nothing get installed for install-man, install_doc and install_html targets, they just rebuild the documentation.
* I've got following error for 'install-info':
$ make -f tests/make make_install_info - make_install_info: cd . && make -f Makefile DESTDIR=/tmp/tmp.Xi4mb9J1a0 install-info
$ tail -f make_install_info ... PERF_VERSION = 3.11.rc1.g9b3c2d make[2]: *** No rule to make target `user-manual.xml', needed by `user-manual.texi'. Stop. make[1]: *** [install-info] Error 2
* I've got following error for 'install-pdf':
$ make -f tests/make make_install_pdf - make_install_pdf: cd . && make -f Makefile DESTDIR=/tmp/tmp.fXseECBbt1 install-pdf
$ tail -f make_install_pdf ... PERF_VERSION = 3.11.rc1.g9b3c2d make[2]: *** No rule to make target `user-manual.xml', needed by `user-manual.pdf'. Stop. make[1]: *** [install-pdf] Error 2
--- tools/perf/tests/make | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
tools/perf/tests/make +31 -0
@@ -29,6 +29,11 @@ make_perf_o := perf.o make_util_map_o := util/map.o make_install := install make_install_bin := install-bin +make_install_doc := install-doc +make_install_man := install-man +make_install_html := install-html +make_install_info := install-info +make_install_pdf := install-pdf # all the NO_* variable combined make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
@@ -60,6 +65,12 @@ run += make_perf_o run += make_util_map_o run += make_install run += make_install_bin +# FIXME 'install-*' commented out till they're fixed +# run += make_install_doc +# run += make_install_man +# run += make_install_html +# run += make_install_info +# run += make_install_pdf run += make_minimal ifneq ($(call has,ctags),)
@@ -100,6 +111,26 @@ test_make_install_O := $(test_make_install) test_make_install_bin := $(test_make_install) test_make_install_bin_O := $(test_make_install) +# FIXME nothing gets installed +test_make_install_man := test -f $$TMP_DEST/share/man/man1/perf.1 +test_make_install_man_O := $(test_make_install_man) + +# FIXME nothing gets installed +test_make_install_doc := $(test_ok) +test_make_install_doc_O := $(test_ok) + +# FIXME nothing gets installed +test_make_install_html := $(test_ok) +test_make_install_html_O := $(test_ok) + +# FIXME nothing gets installed +test_make_install_info := $(test_ok) +test_make_install_info_O := $(test_ok) + +# FIXME nothing gets installed +test_make_install_pdf := $(test_ok) +test_make_install_pdf_O := $(test_ok) + # Kbuild tests only #test_make_python_perf_so_O := test -f $$TMP/tools/perf/python/perf.so #test_make_perf_o_O := test -f $$TMP/tools/perf/perf.o