Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752820AbbGaNth (ORCPT ); Fri, 31 Jul 2015 09:49:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56914 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751299AbbGaNtc (ORCPT ); Fri, 31 Jul 2015 09:49:32 -0400 Date: Fri, 31 Jul 2015 06:49:09 -0700 From: tip-bot for Pawel Moll Message-ID: Cc: jolsa@kernel.org, a.p.zijlstra@chello.nl, pawel.moll@arm.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com Reply-To: linux-kernel@vger.kernel.org, pawel.moll@arm.com, adrian.hunter@intel.com, a.p.zijlstra@chello.nl, jolsa@kernel.org, acme@redhat.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, namhyung@kernel.org In-Reply-To: <1438092613-21014-1-git-send-email-pawel.moll@arm.com> References: <1438092613-21014-1-git-send-email-pawel.moll@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fix test build error when bindir contains double slash Git-Commit-ID: 0927beeca5f9d1a7978f8da9c9d28647859816d3 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 Content-Length: 2325 Lines: 65 Commit-ID: 0927beeca5f9d1a7978f8da9c9d28647859816d3 Gitweb: http://git.kernel.org/tip/0927beeca5f9d1a7978f8da9c9d28647859816d3 Author: Pawel Moll AuthorDate: Tue, 28 Jul 2015 15:10:13 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 28 Jul 2015 13:03:49 -0300 perf tools: Fix test build error when bindir contains double slash When building with a prefix ending with a slash, for example: $ make prefix=/usr/local/ one of the perf tests fail to compile due to BUILD_STR macro mishandling bindir_SQ string containing with two slashes: -DBINDIR="BUILD_STR(/usr/local//bin)" with the following error: CC tests/attr.o tests/attr.c: In function ‘test__attr’: tests/attr.c:168:50: error: expected ‘)’ before ‘;’ token snprintf(path_perf, PATH_MAX, "%s/perf", BINDIR); ^ tests/attr.c:176:1: error: expected ‘;’ before ‘}’ token } ^ tests/attr.c:176:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors This patch works around the problem by "cleaning" the bindir string using make's abspath function. Signed-off-by: Pawel Moll Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1438092613-21014-1-git-send-email-pawel.moll@arm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/config/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 094ddae..d31fac1 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -638,7 +638,7 @@ ifndef DESTDIR prefix ?= $(HOME) endif bindir_relative = bin -bindir = $(prefix)/$(bindir_relative) +bindir = $(abspath $(prefix)/$(bindir_relative)) mandir = share/man infodir = share/info perfexecdir = libexec/perf-core -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/