Re: [Qemu-devel] [PATCH v2 for 3.0 11/16] docker: add expansion for docker-test-FOO to Makefile.include

[Philippe Mathieu-Daudé]

On 07/16/2018 06:07 AM, Alex Bennée wrote:
> Philippe Mathieu-Daudé <address@hidden> writes:
> 
>> Hi Alex,
>>
>> On 07/13/2018 09:17 AM, Alex Bennée wrote:
>>> This allows us to run a particular test on all docker images. For
>>> example:
>>>
>>>   make docker-test-unit
>>>
>>> Will run the unit tests on every supported image. At the same time
>>> rename docker-test to docker-all-tests to be clearer.
>>>
>>> Signed-off-by: Alex Bennée <address@hidden>
>>>
>>> ---
>>> v2
>>>   - docker-test -> docker-all-tests
>>> ---
>>>  tests/docker/Makefile.include | 6 ++++--
>>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
>>> index fe63aacf69..e32c35be0d 100644
>>> --- a/tests/docker/Makefile.include
>>> +++ b/tests/docker/Makefile.include
>>> @@ -151,7 +151,8 @@ $(foreach i,$(filter-out 
>>> $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPR
>>>             $(eval address@hidden: docker-image-$i address@hidden) \
>>>     ) \
>>>     $(foreach t,$(DOCKER_TESTS), \
>>> -           $(eval docker-test: address@hidden) \
>>> +           $(eval docker-all-tests: address@hidden) \
>>> +           $(eval docker-$t: address@hidden) \
>>
>> Is this supposed to work this way?
>>
>> $ make address@hidden
>> make: *** No rule to make target
>> 'address@hidden'.
> 
> No
> 
>   make docker-test-quick
> 
> will make the test-quick on all images.
> 
> Your example fails because debian-alpha-cross is a PARTIAL image, good
> for building test cases but not QEMU so it's not expanded in the above
> bit: $(eval address@hidden: docker-image-$i address@hidden)

I noticed too late ;)

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>

> 
>>  Stop.
>>
>>>     ) \
>>>  )
>>>
>>> @@ -161,7 +162,8 @@ docker:
>>>     @echo 'Available targets:'
>>>     @echo
>>>     @echo '    docker:              Print this help.'
>>> -   @echo '    docker-test:         Run all image/test combinations.'
>>> +   @echo '    docker-all-tests:    Run all image/test combinations.'
>>> +   @echo '    docker-TEST:         Run TEST on all image combinations.'
>>>     @echo '    docker-clean:        Kill and remove residual docker testing 
>>> containers.'
>>>     @echo '    address@hidden:   Run "TEST" in container "IMAGE".'
>>>     @echo '                         Note: "TEST" is one of the listed test 
>>> name,'
>>>
> 
> 
> --
> Alex Bennée
>