tests/docker and tests/tcg cleanup and diet
Get series with b4
b4 am [email protected]Versions newest first
- 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 files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/17 | tests/docker: remove dead code for linux-user containerstests/ | +0 | 0 replies | |
| 2/17 | tests/docker: remove test targetstests/ tests/ | +1 | 0 replies | |
| 3/17 | tests/docker: remove dead variabletests/ | +0 | 0 replies | |
| 4/17 | tests/docker: remove unnecessary default definitionstests/ | +0 | 0 replies | |
| 5/17 | tests/docker: inline variable definitions or move close to usetests/ | +16 | 0 replies | |
| 6/17 | tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES)tests/ | +1 | 0 replies | |
| 7/17 | tests/docker: simplify docker-TEST@IMAGE targetstests/ | +2 | 0 replies | |
| 8/17 | tests/docker: do not duplicate rules for hexagon-crosstests/ tests/ | +4 | 0 replies | |
| 9/17 | tests/tcg: add compiler test variables when using containerstests/ tests/ tests/ +3 more | +28 | 0 replies | |
| 10/17 | tests/tcg: remove CONFIG_LINUX_USER from config-target.maktests/ tests/ tests/ | +2 | 0 replies | |
| 11/17 | tests/tcg: remove CONFIG_USER_ONLY from config-target.maktests/ tests/ | +7 | 0 replies | |
| 12/17 | tests/tcg: prepare Makefile.prereqs at configure timetests/ tests/ tests/ | +14 | 0 replies | |
| 13/17 | tests/tcg: list test targets in Makefile.prereqstests/ tests/ tests/ | +19 | 0 replies | |
| 14/17 | tests/tcg: invoke Makefile.target directly from QEMU's makefiletests/ tests/ tests/ +1 more | +33 | 0 replies | |
| 15/17 | tests/tcg: isolate from QEMU's config-host.makconfigure tests/ tests/ | +7 | 0 replies | |
| 16/17 | tests/docker: remove SKIP_DOCKER_BUILDtests/ tests/ | +1 | 0 replies | |
| 17/17 | tests/tcg: fix non-static buildtests/ | +0 | 0 replies |
Reviews trailers per patch
4 of 17 patches have a Reviewed-by or Acked-by.
| Patch | Alex Bennée | Philippe Mathieu-Daudé |
|---|---|---|
| 1/17 | R-b | |
| 2/17 | ||
| 3/17 | R-b | |
| 4/17 | ||
| 5/17 | ||
| 6/17 | ||
| 7/17 | ||
| 8/17 | ||
| 9/17 | R-b | |
| 10/17 | R-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.
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.qemuSignature · 1 line
2.35.1