[PATCH 2/5] selftest/futex: Update Makefile to use lib.mk

2015-05-08 Thread Darren Hart
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-...@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| 20 +++-
 tools/testing/selftests/futex/functional/Makefile |  5 +++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/futex/Makefile 
b/tools/testing/selftests/futex/Makefile
index 2c26d59..6a17529 100644
--- a/tools/testing/selftests/futex/Makefile
+++ b/tools/testing/selftests/futex/Makefile
@@ -1,11 +1,29 @@
 SUBDIRS := functional
 
+TEST_PROGS := run.sh
+
 .PHONY: all clean
 all:
for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done
 
-run_tests: all
+include ../lib.mk
+
+override define RUN_TESTS
./run.sh
+endef
+
+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
 
 clean:
for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done
diff --git a/tools/testing/selftests/futex/functional/Makefile 
b/tools/testing/selftests/futex/functional/Makefile
index 4098340..fb96927 100644
--- a/tools/testing/selftests/futex/functional/Makefile
+++ b/tools/testing/selftests/futex/functional/Makefile
@@ -12,13 +12,14 @@ TARGETS := \
futex_wait_uninitialized_heap \
futex_wait_private_mapped_file
 
+TEST_PROGS := $(TARGETS) run.sh
+
 .PHONY: all clean
 all: $(TARGETS)
 
 $(TARGETS): $(HEADERS)
 
-run_tests: all
-   ./run.sh
+include ../../lib.mk
 
 clean:
rm -f $(TARGETS)
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 2/5] selftest/futex: Update Makefile to use lib.mk

2015-05-08 Thread Darren Hart
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 shua...@osg.samsung.com
Cc: linux-...@vger.kernel.org
Cc: Ingo Molnar mi...@elte.hu
Cc: Peter Zijlstra pet...@infradead.org
Cc: Thomas Gleixner t...@linutronix.de
Cc: Davidlohr Bueso d...@stgolabs.net
Cc: KOSAKI Motohiro kosaki.motoh...@jp.fujitsu.com
Signed-off-by: Darren Hart dvh...@linux.intel.com
---
 tools/testing/selftests/futex/Makefile| 20 +++-
 tools/testing/selftests/futex/functional/Makefile |  5 +++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/futex/Makefile 
b/tools/testing/selftests/futex/Makefile
index 2c26d59..6a17529 100644
--- a/tools/testing/selftests/futex/Makefile
+++ b/tools/testing/selftests/futex/Makefile
@@ -1,11 +1,29 @@
 SUBDIRS := functional
 
+TEST_PROGS := run.sh
+
 .PHONY: all clean
 all:
for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done
 
-run_tests: all
+include ../lib.mk
+
+override define RUN_TESTS
./run.sh
+endef
+
+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
 
 clean:
for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done
diff --git a/tools/testing/selftests/futex/functional/Makefile 
b/tools/testing/selftests/futex/functional/Makefile
index 4098340..fb96927 100644
--- a/tools/testing/selftests/futex/functional/Makefile
+++ b/tools/testing/selftests/futex/functional/Makefile
@@ -12,13 +12,14 @@ TARGETS := \
futex_wait_uninitialized_heap \
futex_wait_private_mapped_file
 
+TEST_PROGS := $(TARGETS) run.sh
+
 .PHONY: all clean
 all: $(TARGETS)
 
 $(TARGETS): $(HEADERS)
 
-run_tests: all
-   ./run.sh
+include ../../lib.mk
 
 clean:
rm -f $(TARGETS)
-- 
2.1.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk

2015-03-31 Thread Michael Ellerman
On Mon, 2015-03-30 at 09:31 -0700, Darren Hart wrote:
> 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
> >> 
> >> 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?

Up to Shuah. It's a minor nit, so probably a follow-up patch is fine.

> >>  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.

Fare enuf.

cheers



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk

2015-03-31 Thread Michael Ellerman
On Mon, 2015-03-30 at 09:31 -0700, Darren Hart wrote:
 On 3/29/15, 4:49 PM, Michael Ellerman m...@ellerman.id.au 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
  
  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?

Up to Shuah. It's a minor nit, so probably a follow-up patch is fine.

   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.

Fare enuf.

cheers



--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk

2015-03-30 Thread Darren Hart
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-...@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



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk

2015-03-30 Thread Darren Hart
On 3/29/15, 4:49 PM, Michael Ellerman m...@ellerman.id.au 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 shua...@osg.samsung.com
 Cc: linux-...@vger.kernel.org
 Cc: Ingo Molnar mi...@elte.hu
 Cc: Peter Zijlstra pet...@infradead.org
 Cc: Thomas Gleixner t...@linutronix.de
 Cc: Davidlohr Bueso d...@stgolabs.net
 Cc: KOSAKI Motohiro kosaki.motoh...@jp.fujitsu.com
 Signed-off-by: Darren Hart dvh...@linux.intel.com
 ---
  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



--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk

2015-03-29 Thread Michael Ellerman
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-...@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.

>  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?

> +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




--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk

2015-03-29 Thread Michael Ellerman
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 shua...@osg.samsung.com
 Cc: linux-...@vger.kernel.org
 Cc: Ingo Molnar mi...@elte.hu
 Cc: Peter Zijlstra pet...@infradead.org
 Cc: Thomas Gleixner t...@linutronix.de
 Cc: Davidlohr Bueso d...@stgolabs.net
 Cc: KOSAKI Motohiro kosaki.motoh...@jp.fujitsu.com
 Signed-off-by: Darren Hart dvh...@linux.intel.com
 ---
  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.

  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?

 +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




--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 2/5] selftest/futex: Update Makefile to use lib.mk

2015-03-27 Thread Darren Hart
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-...@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
 all:
for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done
 
+include ../lib.mk
+
+override define RUN_TESTS
+   ./run.sh
+endef
+
+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
+
 clean:
for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done
diff --git a/tools/testing/selftests/futex/functional/Makefile 
b/tools/testing/selftests/futex/functional/Makefile
index 6ecb42c..fb96927 100644
--- a/tools/testing/selftests/futex/functional/Makefile
+++ b/tools/testing/selftests/futex/functional/Makefile
@@ -12,10 +12,14 @@ TARGETS := \
futex_wait_uninitialized_heap \
futex_wait_private_mapped_file
 
+TEST_PROGS := $(TARGETS) run.sh
+
 .PHONY: all clean
 all: $(TARGETS)
 
 $(TARGETS): $(HEADERS)
 
+include ../../lib.mk
+
 clean:
rm -f $(TARGETS)
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 2/5] selftest/futex: Update Makefile to use lib.mk

2015-03-27 Thread Darren Hart
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 shua...@osg.samsung.com
Cc: linux-...@vger.kernel.org
Cc: Ingo Molnar mi...@elte.hu
Cc: Peter Zijlstra pet...@infradead.org
Cc: Thomas Gleixner t...@linutronix.de
Cc: Davidlohr Bueso d...@stgolabs.net
Cc: KOSAKI Motohiro kosaki.motoh...@jp.fujitsu.com
Signed-off-by: Darren Hart dvh...@linux.intel.com
---
 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
 all:
for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done
 
+include ../lib.mk
+
+override define RUN_TESTS
+   ./run.sh
+endef
+
+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
+
 clean:
for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done
diff --git a/tools/testing/selftests/futex/functional/Makefile 
b/tools/testing/selftests/futex/functional/Makefile
index 6ecb42c..fb96927 100644
--- a/tools/testing/selftests/futex/functional/Makefile
+++ b/tools/testing/selftests/futex/functional/Makefile
@@ -12,10 +12,14 @@ TARGETS := \
futex_wait_uninitialized_heap \
futex_wait_private_mapped_file
 
+TEST_PROGS := $(TARGETS) run.sh
+
 .PHONY: all clean
 all: $(TARGETS)
 
 $(TARGETS): $(HEADERS)
 
+include ../../lib.mk
+
 clean:
rm -f $(TARGETS)
-- 
2.1.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/