From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751695AbbFYH4O (ORCPT ); Thu, 25 Jun 2015 03:56:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36321 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751502AbbFYHz6 (ORCPT ); Thu, 25 Jun 2015 03:55:58 -0400 Date: Thu, 25 Jun 2015 00:55:33 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: a.p.zijlstra@chello.nl, lukas@wunner.de, acme@redhat.com, eranian@google.com, mingo@kernel.org, ak@linux.intel.com, jolsa@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, tglx@linutronix.de, namhyung@kernel.org, linux-kernel@vger.kernel.org, dsahern@gmail.com Reply-To: acme@redhat.com, mingo@kernel.org, eranian@google.com, lukas@wunner.de, a.p.zijlstra@chello.nl, ak@linux.intel.com, adrian.hunter@intel.com, jolsa@kernel.org, hpa@zytor.com, tglx@linutronix.de, namhyung@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org In-Reply-To: <1434977452-32520-2-git-send-email-jolsa@kernel.org> References: <1434977452-32520-2-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tests: Add testing for Makefile.perf Git-Commit-ID: 502819c5f35ef44eb7151fb85cd883c5b76b506d 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: 502819c5f35ef44eb7151fb85cd883c5b76b506d Gitweb: http://git.kernel.org/tip/502819c5f35ef44eb7151fb85cd883c5b76b506d Author: Jiri Olsa AuthorDate: Mon, 22 Jun 2015 14:50:50 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 22 Jun 2015 11:21:57 -0300 perf tests: Add testing for Makefile.perf Currently we test only builds through top level Makefile, but seems like there's a bunch of users using Makefile.perf directly. Changing the make suite to be run for Makefile.perf as well. It takes now considerable amount of time, but hopefully we catch more issues. Also fixing the output indentation for make_kernelsrc and make_kernelsrc_tools tests. 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-2-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/make | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/tools/perf/tests/make b/tools/perf/tests/make index 65280d2..bfe1962da 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -1,5 +1,16 @@ +ifndef MK +ifeq ($(MAKECMDGOALS),) +# no target specified, trigger the whole suite +all: + @echo "Testing Makefile"; $(MAKE) -sf tests/make MK=Makefile + @echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf +else +# run only specific test over 'Makefile' +%: + @echo "Testing Makefile"; $(MAKE) -sf tests/make MK=Makefile $@ +endif +else PERF := . -MK := Makefile include config/Makefile.arch @@ -57,7 +68,12 @@ make_minimal += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 # $(run) contains all available tests run := make_pure +# Targets 'clean all' can be run together only through top level +# Makefile because we detect clean target in Makefile.perf and +# disable features detection +ifeq ($(MK),Makefile) run += make_clean_all +endif run += make_python_perf_so run += make_debug run += make_no_libperl @@ -226,13 +242,13 @@ tarpkg: ( eval $$cmd ) >> $@ 2>&1 make_kernelsrc: - @echo " - make -C tools/perf" + @echo "- make -C tools/perf" $(call clean); \ (make -C ../.. tools/perf) > $@ 2>&1 && \ test -x perf && rm -f $@ || (cat $@ ; false) make_kernelsrc_tools: - @echo " - make -C /tools perf" + @echo "- make -C /tools perf" $(call clean); \ (make -C ../../tools perf) > $@ 2>&1 && \ test -x perf && rm -f $@ || (cat $@ ; false) @@ -244,3 +260,4 @@ out: $(run_O) @echo OK .PHONY: all $(run) $(run_O) tarpkg clean +endif # ifndef MK