linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Andi Kleen <ak@linux.intel.com>, David Ahern <dsahern@gmail.com>,
	Lukas Wunner <lukas@wunner.de>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Stephane Eranian <eranian@google.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 03/13] perf tests: Add test for make install with prefix
Date: Tue, 23 Jun 2015 18:47:17 -0300	[thread overview]
Message-ID: <1435096047-32088-4-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1435096047-32088-1-git-send-email-acme@kernel.org>

From: Jiri Olsa <jolsa@kernel.org>

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>
---
 tools/perf/tests/make | 8 ++++++++
 1 file changed, 8 insertions(+)

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
 make_install_html   := install-html
 make_install_info   := install-info
 make_install_pdf    := install-pdf
+make_install_prefix := install prefix=/tmp/krava
 make_static         := LDFLAGS=-static
 
 # all the NO_* variable combined
@@ -99,6 +100,7 @@ run += make_util_map_o
 run += make_util_pmu_bison_o
 run += make_install
 run += make_install_bin
+run += make_install_prefix
 # FIXME 'install-*' commented out till they're fixed
 # run += make_install_doc
 # run += make_install_man
@@ -173,6 +175,12 @@ 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))
 
+# We prefix all installed files for make_install_prefix
+# with '/tmp/krava' to match installed/prefix-ed files.
+installed_files_all_prefix := $(addprefix /tmp/krava/,$(installed_files_all))
+test_make_install_prefix   := $(call test_dest_files,$(installed_files_all_prefix))
+test_make_install_prefix_O := $(call test_dest_files,$(installed_files_all_prefix))
+
 # 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)
-- 
2.1.0


  parent reply	other threads:[~2015-06-23 21:48 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-23 21:47 [GIT PULL 00/13] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-06-23 21:47 ` [PATCH 01/13] perf top: Move toggling event logic into hists browser Arnaldo Carvalho de Melo
2015-06-23 21:47 ` [PATCH 02/13] perf tests: Add testing for Makefile.perf Arnaldo Carvalho de Melo
2015-06-23 21:47 ` Arnaldo Carvalho de Melo [this message]
2015-06-23 21:47 ` [PATCH 04/13] perf build: Fix single target build dependency check Arnaldo Carvalho de Melo
2015-06-23 21:47 ` [PATCH 05/13] perf pmu: Use __weak definition from <linux/compiler.h> Arnaldo Carvalho de Melo
2015-06-23 21:47 ` [PATCH 06/13] perf pmu: Split perf_pmu__new_alias() Arnaldo Carvalho de Melo
2015-06-23 21:47 ` [PATCH 07/13] perf tools: Allow events with dot Arnaldo Carvalho de Melo
2015-06-23 21:47 ` [PATCH 08/13] perf session: Print a newline when dumping PERF_RECORD_FINISHED_ROUND Arnaldo Carvalho de Melo
2015-06-23 21:47 ` [PATCH 09/13] perf tools: Print a newline before dumping Aggregated stats Arnaldo Carvalho de Melo
2015-06-23 21:47 ` [PATCH 10/13] perf probe: Fix failure to probe events on arm Arnaldo Carvalho de Melo
2015-06-23 21:47 ` [PATCH 11/13] perf thread_map: Don't access the array entries directly Arnaldo Carvalho de Melo
2015-06-23 21:47 ` [PATCH 12/13] perf thread_map: Change map entries into a struct Arnaldo Carvalho de Melo
2015-06-25  8:38   ` Jiri Olsa
2015-06-25 13:45     ` Arnaldo Carvalho de Melo
2015-06-25 17:48       ` Arnaldo Carvalho de Melo
2015-06-26  8:43         ` [tip:perf/urgent] perf tools: Future-proof thread_map allocation size calculation tip-bot for Arnaldo Carvalho de Melo
2015-06-23 21:47 ` [PATCH 13/13] perf tools: Allow auxtrace data alignment Arnaldo Carvalho de Melo
2015-06-25  7:31 ` [GIT PULL 00/13] perf/core improvements and fixes Ingo Molnar
2015-06-25 13:48   ` Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435096047-32088-4-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=ak@linux.intel.com \
    --cc=dsahern@gmail.com \
    --cc=eranian@google.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lukas@wunner.de \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).