[v2,7/8] selftest/x86: install tests

Message ID 1429308126-5591-1-git-send-email-tyler.baker@linaro.org
State New
Headers show

Commit Message

Tyler Baker April 17, 2015, 10:02 p.m.
Include lib.mk and set TEST_PROGS where appropriate. Skip the install and test
case when CROSS_COMPILE is not set.

Cc: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Tyler Baker <tyler.baker@linaro.org>
---
 tools/testing/selftests/x86/Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Tyler Baker April 17, 2015, 10:35 p.m. | #1
On 17 April 2015 at 15:28, Andy Lutomirski <luto@amacapital.net> wrote:
> On Fri, Apr 17, 2015 at 3:02 PM, Tyler Baker <tyler.baker@linaro.org> wrote:
>> Include lib.mk and set TEST_PROGS where appropriate. Skip the install and test
>> case when CROSS_COMPILE is not set.
>>
>> Cc: Andy Lutomirski <luto@amacapital.net>
>> Signed-off-by: Tyler Baker <tyler.baker@linaro.org>
>> ---
>>  tools/testing/selftests/x86/Makefile | 9 +++++++++
>>  1 file changed, 9 insertions(+)
>>
>> diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile
>> index 9962e10..622717e 100644
>> --- a/tools/testing/selftests/x86/Makefile
>> +++ b/tools/testing/selftests/x86/Makefile
>> @@ -12,19 +12,28 @@ UNAME_M := $(shell uname -m)
>>  ifeq ($(CROSS_COMPILE),)
>>  # Always build 32-bit tests
>>  all: all_32
>> +# Install 32-bit tests
>> +TEST_PROGS += $(BINARIES_32) run_x86_tests.sh
>>  # If we're on a 64-bit host, build 64-bit tests as well
>>  ifeq ($(UNAME_M),x86_64)
>>  all: all_32 all_64
>> +# Install 64-bit tests
>> +TEST_PROGS += $(BINARIES_64)
>>  endif
>>  else
>>  # No dependency on all when cross building
>>  all:
>> +# Skip install and test case when not built
>> +override INSTALL_RULE :=
>> +override EMIT_TESTS :=  echo "echo \"selftests: run_x86_tests.sh [SKIP]\""
>
> I may just be confused, but why is an emply TEST_PROGS insufficient?

This is a good question. The default install in lib.mk rule blindly
calls 'install -t <INSTALL_PATH>  <TEST_PROG>' which fails the install
as it is not enough arguments passed. Perhaps we fix this behavior in
lib.mk.

>
> --Andy
>
>>  endif
>>
>>  all_32: check_build32 $(BINARIES_32)
>>
>>  all_64: $(BINARIES_64)
>>
>> +include ../lib.mk
>> +
>>  clean:
>>         $(RM) $(BINARIES_32) $(BINARIES_64)
>>
>> --
>> 2.1.4
>>
>
>
>
> --
> Andy Lutomirski
> AMA Capital Management, LLC

Patch hide | download patch | download mbox

diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile
index 9962e10..622717e 100644
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@ -12,19 +12,28 @@  UNAME_M := $(shell uname -m)
 ifeq ($(CROSS_COMPILE),)
 # Always build 32-bit tests
 all: all_32
+# Install 32-bit tests
+TEST_PROGS += $(BINARIES_32) run_x86_tests.sh
 # If we're on a 64-bit host, build 64-bit tests as well
 ifeq ($(UNAME_M),x86_64)
 all: all_32 all_64
+# Install 64-bit tests
+TEST_PROGS += $(BINARIES_64)
 endif
 else
 # No dependency on all when cross building
 all:
+# Skip install and test case when not built
+override INSTALL_RULE :=
+override EMIT_TESTS :=  echo "echo \"selftests: run_x86_tests.sh [SKIP]\""
 endif
 
 all_32: check_build32 $(BINARIES_32)
 
 all_64: $(BINARIES_64)
 
+include ../lib.mk
+
 clean:
 	$(RM) $(BINARIES_32) $(BINARIES_64)