Skip to content

tests/docker and tests/tcg cleanup and diet

Paolo Bonzini qemu-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest17 patches 1 replyIn review

v1->v2 from the cover letter

- rebased
- also remove empty dockerfile [Alex]
- fixed container_cross_as [Richard]
- simplify docker-TEST@IMAGE even further
- cleanup hexagon-cross
- check that targets match one of *-softmmu, *-linux-user, *-bsd-user
- cleaner tests/tcg/configure.sh, set got_cross_cc=yes for docker case
- do not include config-host.mak at all in tests/tcg
- remove "docker.py check"

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17tests/docker: remove dead code for linux-user containerstests/docker/Makefile.include+0 -110 replies
2/17tests/docker: remove test targetstests/docker/Makefile.include tests/docker/dockerfiles/empty.docker+1 -270 replies
3/17tests/docker: remove dead variabletests/docker/Makefile.include+0 -10 replies
4/17tests/docker: remove unnecessary default definitionstests/docker/Makefile.include+0 -50 replies
5/17tests/docker: inline variable definitions or move close to usetests/docker/Makefile.include+16 -160 replies
6/17tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES)tests/docker/Makefile.include+1 -10 replies
7/17tests/docker: simplify docker-TEST@IMAGE targetstests/docker/Makefile.include+2 -100 replies
8/17tests/docker: do not duplicate rules for hexagon-crosstests/docker/Makefile.include tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh+4 -220 replies
9/17tests/tcg: add compiler test variables when using containerstests/tcg/aarch64/Makefile.softmmu-target tests/tcg/aarch64/Makefile.target tests/tcg/configure.sh +3 more+28 -110 replies
10/17tests/tcg: remove CONFIG_LINUX_USER from config-target.maktests/tcg/configure.sh tests/tcg/multiarch/Makefile.target tests/tcg/x86_64/Makefile.target+2 -40 replies
11/17tests/tcg: remove CONFIG_USER_ONLY from config-target.maktests/tcg/Makefile.target tests/tcg/configure.sh+7 -130 replies
12/17tests/tcg: prepare Makefile.prereqs at configure timetests/Makefile.include tests/tcg/Makefile.prereqs tests/tcg/configure.sh+14 -230 replies
13/17tests/tcg: list test targets in Makefile.prereqstests/Makefile.include tests/tcg/Makefile.qemu tests/tcg/configure.sh+19 -230 replies
14/17tests/tcg: invoke Makefile.target directly from QEMU's makefiletests/Makefile.include tests/tcg/Makefile.qemu tests/tcg/Makefile.target +1 more+33 -1440 replies
15/17tests/tcg: isolate from QEMU's config-host.makconfigure tests/tcg/Makefile.target tests/tcg/configure.sh+7 -40 replies
16/17tests/docker: remove SKIP_DOCKER_BUILDtests/docker/Makefile.include tests/docker/docker.py+1 -680 replies
17/17tests/tcg: fix non-static buildtests/tcg/configure.sh+0 -10 replies

Reviews trailers per patch

4 of 17 patches have a Reviewed-by or Acked-by.

PatchAlex BennéePhilippe Mathieu-Daudé
1/17R-b
2/17
3/17R-b
4/17
5/17
6/17
7/17
8/17
9/17R-b
10/17R-b
11/17
12/17
13/17
14/17
15/17
16/17
17/17

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/17] tests/docker and tests/tcg cleanup and diet

The first eight patches simplify and clean up a bit the tests/docker/Makefile.include file.

The rest adjust tests/Makefile.include to invoke the tests/tcg Makefiles directly, without going through Makefile.qemu and Makefile.prereqs. All information is gathered at configure time, and the config*.mak files for each TCG test target includes the normal Makefile variables (AC, CC, LD, etc.). tests/tcg stops using config-host.mak, too.

This is also a first step towards moving the cross-compilation infrastructure from tests/tcg to all of QEMU, so that it can be used to build firmware binaries. The next steps would be along the lines of:

- add more binutils to the tests/tcg per-target config files

- move tests/tcg/configure.sh into the main configure script

- extract parts of configure.sh into shell functions and use them to generate the roms/ .mak files

Paolo

v1->v2:
- rebased
- also remove empty dockerfile [Alex]
- fixed container_cross_as [Richard]
- simplify docker-TEST@IMAGE even further
- cleanup hexagon-cross
- check that targets match one of *-softmmu, *-linux-user, *-bsd-user
- cleaner tests/tcg/configure.sh, set got_cross_cc=yes for docker case
- do not include config-host.mak at all in tests/tcg
- remove "docker.py check"

Paolo Bonzini (17):
tests/docker: remove dead code for linux-user containers tests/docker: remove test targets
tests/docker: remove dead variable
tests/docker: remove unnecessary default definitions tests/docker: inline variable definitions or move close to use tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES) tests/docker: simplify docker-TEST@IMAGE targets tests/docker: do not duplicate rules for hexagon-cross tests/tcg: add compiler test variables when using containers tests/tcg: remove CONFIG_LINUX_USER from config-target.mak tests/tcg: remove CONFIG_USER_ONLY from config-target.mak tests/tcg: prepare Makefile.prereqs at configure time tests/tcg: list test targets in Makefile.prereqs tests/tcg: invoke Makefile.target directly from QEMU's makefile tests/tcg: isolate from QEMU's config-host.mak tests/docker: remove SKIP_DOCKER_BUILD
tests/tcg: fix non-static build

 configure                                     |   3 +-
 tests/Makefile.include                        |  55 ++++----
 tests/docker/Makefile.include                 | 115 ++++-------------
 tests/docker/docker.py                        |  57 ---------
 .../build-toolchain.sh                        |   0
 tests/docker/dockerfiles/empty.docker         |   8 --
 tests/tcg/Makefile.prereqs                    |  18 ---
 tests/tcg/Makefile.qemu                       | 121 ------------------
 tests/tcg/Makefile.target                     |  14 +-
 tests/tcg/aarch64/Makefile.softmmu-target     |   2 +-
 tests/tcg/aarch64/Makefile.target             |  10 +-
 tests/tcg/configure.sh                        |  78 +++++++----
 tests/tcg/i386/Makefile.target                |   2 +-
 tests/tcg/multiarch/Makefile.target           |   2 +-
 tests/tcg/ppc64/Makefile.target               |   4 +-
 tests/tcg/ppc64le/Makefile.target             |   4 +-
 tests/tcg/x86_64/Makefile.target              |   2 +-
 17 files changed, 123 insertions(+), 372 deletions(-)
 rename tests/docker/dockerfiles/{debian-hexagon-cross.docker.d => debian-hexagon-cross.d}/build-toolchain.sh (100%)
 delete mode 100644 tests/docker/dockerfiles/empty.docker
 delete mode 100644 tests/tcg/Makefile.prereqs
 delete mode 100644 tests/tcg/Makefile.qemu
Signature · 1 line
2.35.1