[v1] tests/docker and tests/tcg cleanup and diet

[PATCH 02/15] tests/docker: remove test targets

Posted by Paolo Bonzini 3 years, 8 months ago

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/docker/Makefile.include | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index a6a5a20949..8248cfdb4f 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -99,24 +99,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
 			{ echo "You will need to build $(EXECUTABLE)"; exit 1;},\
 			"CHECK", "debian-$* exists"))
 
-# These are test targets
-USER_TCG_TARGETS=$(patsubst %-linux-user,qemu-%,$(filter %-linux-user,$(TARGET_DIRS)))
-EXEC_COPY_TESTS=$(patsubst %,docker-exec-copy-test-%, $(USER_TCG_TARGETS))
-
-$(EXEC_COPY_TESTS): docker-exec-copy-test-%: $(DOCKER_FILES_DIR)/empty.docker
-	$(call quiet-command,							\
-		$(DOCKER_SCRIPT) build -t qemu/exec-copy-test-$* -f $< 		\
-			$(if $V,,--quiet) --no-cache 				\
-			--include-executable=$*					\
-			--skip-binfmt,						\
-			"TEST","copy $* to container")
-	$(call quiet-command,							\
-		$(DOCKER_SCRIPT) run qemu/exec-copy-test-$* 			\
-			/$* -version > tests/docker-exec-copy-test-$*.out,	\
-			"TEST","check $* works in container")
-
-docker-exec-copy-test: $(EXEC_COPY_TESTS)
-
 endif
 
 # Enforce dependencies for composite images
-- 
2.31.1

Re: [PATCH 02/15] tests/docker: remove test targets

Posted by Alex Bennée 3 years, 8 months ago

Paolo Bonzini <pbonzini@redhat.com> writes:

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  tests/docker/Makefile.include | 18 ------------------
>  1 file changed, 18 deletions(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index a6a5a20949..8248cfdb4f 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -99,24 +99,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
>  			{ echo "You will need to build $(EXECUTABLE)"; exit 1;},\
>  			"CHECK", "debian-$* exists"))
>  
> -# These are test targets
> -USER_TCG_TARGETS=$(patsubst %-linux-user,qemu-%,$(filter %-linux-user,$(TARGET_DIRS)))
> -EXEC_COPY_TESTS=$(patsubst %,docker-exec-copy-test-%, $(USER_TCG_TARGETS))
> -
> -$(EXEC_COPY_TESTS): docker-exec-copy-test-%:
> $(DOCKER_FILES_DIR)/empty.docker

Should probably clean-up the empty.docker while you are at it. It's a
niche command but I wonder how we would copy new tests now?

> -	$(call quiet-command,							\
> -		$(DOCKER_SCRIPT) build -t qemu/exec-copy-test-$* -f $< 		\
> -			$(if $V,,--quiet) --no-cache 				\
> -			--include-executable=$*					\
> -			--skip-binfmt,						\
> -			"TEST","copy $* to container")
> -	$(call quiet-command,							\
> -		$(DOCKER_SCRIPT) run qemu/exec-copy-test-$* 			\
> -			/$* -version > tests/docker-exec-copy-test-$*.out,	\
> -			"TEST","check $* works in container")
> -
> -docker-exec-copy-test: $(EXEC_COPY_TESTS)
> -
>  endif
>  
>  # Enforce dependencies for composite images


-- 
Alex Bennée

Re: [PATCH 02/15] tests/docker: remove test targets

Posted by Paolo Bonzini 3 years, 8 months ago

On 3/28/22 18:44, Alex Bennée wrote:
> 
> Paolo Bonzini <pbonzini@redhat.com> writes:
> 
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>>   tests/docker/Makefile.include | 18 ------------------
>>   1 file changed, 18 deletions(-)
>>
>> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
>> index a6a5a20949..8248cfdb4f 100644
>> --- a/tests/docker/Makefile.include
>> +++ b/tests/docker/Makefile.include
>> @@ -99,24 +99,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
>>   			{ echo "You will need to build $(EXECUTABLE)"; exit 1;},\
>>   			"CHECK", "debian-$* exists"))
>>   
>> -# These are test targets
>> -USER_TCG_TARGETS=$(patsubst %-linux-user,qemu-%,$(filter %-linux-user,$(TARGET_DIRS)))
>> -EXEC_COPY_TESTS=$(patsubst %,docker-exec-copy-test-%, $(USER_TCG_TARGETS))
>> -
>> -$(EXEC_COPY_TESTS): docker-exec-copy-test-%:
>> $(DOCKER_FILES_DIR)/empty.docker
> 
> Should probably clean-up the empty.docker while you are at it. It's a
> niche command but I wonder how we would copy new tests now?

You can always document them as an alternative to this patch. :)

Paolo