linux-next: manual merge of the kselftest tree with the kselftest-fixes tree

linux-next: manual merge of the kselftest tree with the kselftest-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2180 bytes --]

Hi Shuah,

Today's linux-next merge of the kselftest tree got a cselftests/kcmp:
Always try to build the testonflict in
tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff ("")
from the kselftest-fixes tree and commit c0d8a9393efd
("selftests/kcmp: add install target to enable installing test") from
the kselftest tree.

I fixed it up (see below - probably some more could be done) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc tools/testing/selftests/kcmp/Makefile
index ff0eefdc6ceb,753890f8d3b7..000000000000
--- a/tools/testing/selftests/kcmp/Makefile
+++ b/tools/testing/selftests/kcmp/Makefile
@@@ -1,10 -1,48 +1,30 @@@
 -uname_M := $(shell uname -m 2>/dev/null || echo not)
 -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/)
 -ifeq ($(ARCH),i386)
 -        ARCH := x86
 -	CFLAGS := -DCONFIG_X86_32 -D__i386__
 -endif
 -ifeq ($(ARCH),x86_64)
 -	ARCH := x86
 -	CFLAGS := -DCONFIG_X86_64 -D__x86_64__
 -endif
 -
 -CFLAGS += -I../../../../arch/x86/include/generated/
 -CFLAGS += -I../../../../include/
 +CC := $(CROSS_COMPILE)$(CC)
  CFLAGS += -I../../../../usr/include/
 -CFLAGS += -I../../../../arch/x86/include/
  
+ TEST_STR = ./kcmp_test || echo kcmp_test: [FAIL]
+ 
 -all:
 -ifeq ($(ARCH),x86)
 -	gcc $(CFLAGS) kcmp_test.c -o kcmp_test
 -else
 -	echo "Not an x86 target, can't build kcmp selftest"
 -endif
 +all: kcmp_test
  
+ install:
+ ifdef INSTALL_KSFT_PATH
+ ifeq ($(ARCH),x86)
+ 	install ./kcmp_test $(INSTALL_KSFT_PATH)
+ 	@echo echo Start kcmp test .... >> $(KSELFTEST)
+ 	@echo "$(TEST_STR)" >> $(KSELFTEST)
+ 	@echo rm -f kcmp-test-file >> $(KSELFTEST)
+ 	@echo echo End kcmp test .... >> $(KSELFTEST)
+ 	@echo echo ============================== >> $(KSELFTEST)
+ else
+ 	@echo Not an x86 target, unable install kcmp selftests
+ endif
+ else
+ 	@echo Run make kselftest_install in top level source directory
+ endif
+ 
  run_tests: all
- 	@./kcmp_test || echo "kcmp_test: [FAIL]"
+ ifeq ($(ARCH),x86)
+ 	@$(TEST_STR)
+ endif
  
  clean:
  	$(RM) kcmp_test kcmp-test-file

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the kselftest tree with the kselftest-fixes tree

[Michael Ellerman]

On Wed, 2014-12-03 at 20:32 +1100, Stephen Rothwell wrote:
> Hi Shuah,
> 
> Today's linux-next merge of the kselftest tree got a cselftests/kcmp:
> Always try to build the testonflict in
> tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff ("")
> from the kselftest-fixes tree and commit c0d8a9393efd
> ("selftests/kcmp: add install target to enable installing test") from
> the kselftest tree.

That got a bit mixed up, I think it should be:

  Today's linux-next merge of the kselftest tree got a conflict in
  tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff
  ("selftests/kcmp: Always try to build the test") from the kselftest-fixes
  tree and commit c0d8a9393efd ("selftests/kcmp: add install target to enable
  installing test") from the kselftest tree.

> I fixed it up (see below - probably some more could be done) and can
> carry the fix as necessary (no action is required).

That resolution basically negates the effect of the first patch.

Shuah, seeing these are both your trees are you happy to do the proper
resolution?

cheers

Re: linux-next: manual merge of the kselftest tree with the kselftest-fixes tree

[Shuah Khan]

On 12/03/2014 04:56 AM, Michael Ellerman wrote:
> On Wed, 2014-12-03 at 20:32 +1100, Stephen Rothwell wrote:
>> Hi Shuah,
>>
>> Today's linux-next merge of the kselftest tree got a cselftests/kcmp:
>> Always try to build the testonflict in
>> tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff ("")
>> from the kselftest-fixes tree and commit c0d8a9393efd
>> ("selftests/kcmp: add install target to enable installing test") from
>> the kselftest tree.
> 
> That got a bit mixed up, I think it should be:
> 
>   Today's linux-next merge of the kselftest tree got a conflict in
>   tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff
>   ("selftests/kcmp: Always try to build the test") from the kselftest-fixes
>   tree and commit c0d8a9393efd ("selftests/kcmp: add install target to enable
>   installing test") from the kselftest tree.
> 
>> I fixed it up (see below - probably some more could be done) and can
>> carry the fix as necessary (no action is required).
> 
> That resolution basically negates the effect of the first patch.
> 
> Shuah, seeing these are both your trees are you happy to do the proper
> resolution?
> 

Stephen and Michael,

I will sort this out. I have some patches in next that I should have
cleaned up yesterday when I applied commit 4c12df63f7ff.

Sorry for the mix-up

thanks,
-- Shuah


-- 
Shuah Khan
Sr. Linux Kernel Developer
Samsung Research America (Silicon Valley)
shuahkh@osg.samsung.com | (970) 217-8978

Re: linux-next: manual merge of the kselftest tree with the kselftest-fixes tree

[Shuah Khan]

On 12/03/2014 07:09 AM, Shuah Khan wrote:
> On 12/03/2014 04:56 AM, Michael Ellerman wrote:
>> On Wed, 2014-12-03 at 20:32 +1100, Stephen Rothwell wrote:
>>> Hi Shuah,
>>>
>>> Today's linux-next merge of the kselftest tree got a cselftests/kcmp:
>>> Always try to build the testonflict in
>>> tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff ("")
>>> from the kselftest-fixes tree and commit c0d8a9393efd
>>> ("selftests/kcmp: add install target to enable installing test") from
>>> the kselftest tree.
>>
>> That got a bit mixed up, I think it should be:
>>
>>   Today's linux-next merge of the kselftest tree got a conflict in
>>   tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff
>>   ("selftests/kcmp: Always try to build the test") from the kselftest-fixes
>>   tree and commit c0d8a9393efd ("selftests/kcmp: add install target to enable
>>   installing test") from the kselftest tree.
>>
>>> I fixed it up (see below - probably some more could be done) and can
>>> carry the fix as necessary (no action is required).
>>
>> That resolution basically negates the effect of the first patch.
>>
>> Shuah, seeing these are both your trees are you happy to do the proper
>> resolution?
>>
> 
> Stephen and Michael,
> 
> I will sort this out. I have some patches in next that I should have
> cleaned up yesterday when I applied commit 4c12df63f7ff.
> 
> Sorry for the mix-up
> 

Done. kselftes-next is clean now.

-- Shuah

-- 
Shuah Khan
Sr. Linux Kernel Developer
Samsung Research America (Silicon Valley)
shuahkh@osg.samsung.com | (970) 217-8978