aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2015-06-22 08:50:51 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-06-22 10:24:05 -0400
commiteb30d2c5077b30f9f8e00eb2e5fadba18b148538 (patch)
tree1cc0c5263ae271d9597b01ec429fc95c623b1b38
parent502819c5f35ef44eb7151fb85cd883c5b76b506d (diff)
perf tests: Add test for make install with prefix
Lukas Wunner reported issue (and fix[1]) with 'make install prefix=...'. Adding automated test for this, so it wouldn't happen again. [1]: 75e84ab906ef ("perf tools: Fix build breakage if prefix= is specified") Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Lukas Wunner <lukas@wunner.de> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1434977452-32520-3-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/tests/make8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index bfe1962da0df..729112f4cfaa 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -58,6 +58,7 @@ make_install_man := install-man
58make_install_html := install-html 58make_install_html := install-html
59make_install_info := install-info 59make_install_info := install-info
60make_install_pdf := install-pdf 60make_install_pdf := install-pdf
61make_install_prefix := install prefix=/tmp/krava
61make_static := LDFLAGS=-static 62make_static := LDFLAGS=-static
62 63
63# all the NO_* variable combined 64# all the NO_* variable combined
@@ -99,6 +100,7 @@ run += make_util_map_o
99run += make_util_pmu_bison_o 100run += make_util_pmu_bison_o
100run += make_install 101run += make_install
101run += make_install_bin 102run += make_install_bin
103run += make_install_prefix
102# FIXME 'install-*' commented out till they're fixed 104# FIXME 'install-*' commented out till they're fixed
103# run += make_install_doc 105# run += make_install_doc
104# run += make_install_man 106# run += make_install_man
@@ -173,6 +175,12 @@ test_make_install_O := $(call test_dest_files,$(installed_files_all))
173test_make_install_bin := $(call test_dest_files,$(installed_files_bin)) 175test_make_install_bin := $(call test_dest_files,$(installed_files_bin))
174test_make_install_bin_O := $(call test_dest_files,$(installed_files_bin)) 176test_make_install_bin_O := $(call test_dest_files,$(installed_files_bin))
175 177
178# We prefix all installed files for make_install_prefix
179# with '/tmp/krava' to match installed/prefix-ed files.
180installed_files_all_prefix := $(addprefix /tmp/krava/,$(installed_files_all))
181test_make_install_prefix := $(call test_dest_files,$(installed_files_all_prefix))
182test_make_install_prefix_O := $(call test_dest_files,$(installed_files_all_prefix))
183
176# FIXME nothing gets installed 184# FIXME nothing gets installed
177test_make_install_man := test -f $$TMP_DEST/share/man/man1/perf.1 185test_make_install_man := test -f $$TMP_DEST/share/man/man1/perf.1
178test_make_install_man_O := $(test_make_install_man) 186test_make_install_man_O := $(test_make_install_man)