From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753147AbbC3QbI (ORCPT ); Mon, 30 Mar 2015 12:31:08 -0400 Received: from mga14.intel.com ([192.55.52.115]:47131 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753081AbbC3QbG (ORCPT ); Mon, 30 Mar 2015 12:31:06 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,494,1422950400"; d="scan'208";a="687739964" User-Agent: Microsoft-MacOutlook/14.4.8.150116 Date: Mon, 30 Mar 2015 09:31:14 -0700 Subject: Re: [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk From: Darren Hart To: Michael Ellerman CC: Linux Kernel Mailing List , Shuah Khan , , Ingo Molnar , Peter Zijlstra , Thomas Gleixner , Davidlohr Bueso , KOSAKI Motohiro Message-ID: Thread-Topic: [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk References: <597c9eabcac5da9456d6cfd6de9117591d73385e.1427493640.git.dvhart@linux.intel.com> <95d599bc531666252f8e3f4e467d5f94af2a7ad2.1427493640.git.dvhart@linux.intel.com> <1427672978.4218.3.camel@ellerman.id.au> In-Reply-To: <1427672978.4218.3.camel@ellerman.id.au> Mime-version: 1.0 Content-type: text/plain; charset="US-ASCII" Content-transfer-encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/29/15, 4:49 PM, "Michael Ellerman" wrote: >On Fri, 2015-03-27 at 15:17 -0700, Darren Hart wrote: >> Adapt the futextest Makefiles to use lib.mk macros for RUN_TESTS and >> EMIT_TESTS. For now, we reuse the run.sh mechanism provided by >> futextest. This doesn't provide the standard selftests: [PASS|FAIL] >> format, but the tests provide very similar output already. >> >> This results in the run_kselftest.sh script for futexes including a >> single line: ./run.sh >> >> Cc: Shuah Khan >> Cc: linux-api@vger.kernel.org >> Cc: Ingo Molnar >> Cc: Peter Zijlstra >> Cc: Thomas Gleixner >> Cc: Davidlohr Bueso >> Cc: KOSAKI Motohiro >> Signed-off-by: Darren Hart >> --- >> tools/testing/selftests/futex/Makefile | 21 >>+++++++++++++++++++++ >> tools/testing/selftests/futex/functional/Makefile | 4 ++++ >> 2 files changed, 25 insertions(+) >> >> diff --git a/tools/testing/selftests/futex/Makefile >>b/tools/testing/selftests/futex/Makefile >> index 8629187..6a17529 100644 >> --- a/tools/testing/selftests/futex/Makefile >> +++ b/tools/testing/selftests/futex/Makefile >> @@ -1,8 +1,29 @@ >> SUBDIRS := functional >> >> +TEST_PROGS := run.sh >> + >> .PHONY: all clean > >lib.mk defines all & clean as PHONY for you. OK, I can remove this (it was just part of the originals). Shall I resent the whole series or just a follow-on patch? > >> all: >> for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done >> >> +include ../lib.mk >> + >> +override define RUN_TESTS >> + ./run.sh >> +endef > >Do you need to do this override? The standard logic should work AFAICS, >or do >you not want the echo logic? The standard logic wants to run each individual test and uses the echo logic. My tests have their own pass/fail reporting mechanism. As I run many options on the same tests and have pretty-printing logic, I prefer to keep that in a run script rather than in a makefile. I don't care for the echo logic as a mechanism, I think the reporting should be part of the test. It also doesn't scale past pass/fail - like xpass and xfail, for example. > >> +override define INSTALL_RULE >> + mkdir -p $(INSTALL_PATH) >> + install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) >>$(TEST_FILES) >> + >> + @for SUBDIR in $(SUBDIRS); do \ >> + $(MAKE) -C $$SUBDIR INSTALL_PATH=$(INSTALL_PATH)/$$SUBDIR install; \ >> + done; >> +endef >> + >> +override define EMIT_TESTS >> + echo "./run.sh" >> +endef > >Ditto. > >cheers > > > > > -- Darren Hart Intel Open Source Technology Center