From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751843AbbFYH42 (ORCPT ); Thu, 25 Jun 2015 03:56:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36334 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751495AbbFYH4M (ORCPT ); Thu, 25 Jun 2015 03:56:12 -0400 Date: Thu, 25 Jun 2015 00:55:51 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: eranian@google.com, a.p.zijlstra@chello.nl, hpa@zytor.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, dsahern@gmail.com, lukas@wunner.de, adrian.hunter@intel.com, acme@redhat.com, tglx@linutronix.de, ak@linux.intel.com, jolsa@kernel.org Reply-To: adrian.hunter@intel.com, lukas@wunner.de, ak@linux.intel.com, jolsa@kernel.org, acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, namhyung@kernel.org, hpa@zytor.com, a.p.zijlstra@chello.nl, eranian@google.com, dsahern@gmail.com, mingo@kernel.org In-Reply-To: <1434977452-32520-3-git-send-email-jolsa@kernel.org> References: <1434977452-32520-3-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tests: Add test for make install with prefix Git-Commit-ID: eb30d2c5077b30f9f8e00eb2e5fadba18b148538 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: eb30d2c5077b30f9f8e00eb2e5fadba18b148538 Gitweb: http://git.kernel.org/tip/eb30d2c5077b30f9f8e00eb2e5fadba18b148538 Author: Jiri Olsa AuthorDate: Mon, 22 Jun 2015 14:50:51 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 22 Jun 2015 11:24:05 -0300 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 Cc: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: Lukas Wunner Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1434977452-32520-3-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/make | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/perf/tests/make b/tools/perf/tests/make index bfe1962da..729112f 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)