diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-05-18 11:48:36 +0200 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-05-18 11:48:36 +0200 |
| commit | 1f952d8cfdbc3caf169777ce416abbf1433f705c (patch) | |
| tree | f2f57ffc416dabe59475d84f7dcd67076d663228 /tests/lcitool/refresh | |
| parent | 85ef20f1673feaa083f4acab8cf054df77b0dbed (diff) | |
| parent | bebe9603fcb072dcdb7fb22005781b3582a4d701 (diff) | |
| download | focaccia-qemu-1f952d8cfdbc3caf169777ce416abbf1433f705c.tar.gz focaccia-qemu-1f952d8cfdbc3caf169777ce416abbf1433f705c.zip | |
Merge tag 'pull-request-2024-05-17' of https://gitlab.com/thuth/qemu into staging
* Fix s390x crash when doing migration / savevm * Decrease size of CI containers by removing unnecessary packages # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmZHTHgRHHRodXRoQHJl # ZGhhdC5jb20ACgkQLtnXdP5wLbXZrxAAsh6zHycGpaQdfcoy3bDmd8gTbuLiME/h # JyJxZ/+GQc+8v8WPwB+HuF7IijtopYCfyO6Vu2y/5wj8i1gHbNulxlS5SjusJp6i # Xxlvuw74xo8Z2oJ6D8Ayk2KHcld5M0m9T77CgP8WcGKmBQU42XWm89fKvviPtn+K # DtLNEpvTlcdEj0uhxhHldHKQnqNryxSHM1MSsmVIKibkQHgG7GBYnw922lZ2x27A # AqSzgzNXAbhmSn75oQfkGUk+vUmlXukfBAHi48BLnAs28sSUue3Su+zw9r8sxhKw # jdvzIB1kyF01AYiKWmhB3voXNduswT9I/cNiQorgOBEJ4lKEzrhsTI92GpvNG3gR # J0CRBUmnGC2k/4GRa+GhFEpFn9FyWeOjPj2oGv03LO4AgTWzi1zNcO++OIWsk0Ge # rO2n2PEEz8RaI/49CTLGi3Eu0Rh0yZnrgZRjcji5ZZ3omQ/OrwXGyr3FMDNFNuXs # vWr9p4K1vz2P/L+RC+TCM0U46gykQuBPseRsdVvbJxAoNP4HwmdE9jDy1Wl1mG1u # Iac63/+srr/871UFzp7ft8ukKTVKy4elQJ78tDCsmRhkVNjLFWwf4SNY6RaneeYM # IbsLcjWpZPl4I9KR6Of5p+aAHAUg6xKIIaIR01fMyQL44ELomfbpH2rKp4tObJHj # WIEKnOWuclo= # =vgc1 # -----END PGP SIGNATURE----- # gpg: Signature made Fri 17 May 2024 02:24:24 PM CEST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] * tag 'pull-request-2024-05-17' of https://gitlab.com/thuth/qemu: hw/intc/s390_flic: Fix crash that occurs when saving the machine state tests/docker/dockerfiles: Update container files with "lcitool-refresh" tests/lcitool/projects/qemu.yml: Sort entries alphabetically again tests/lcitool: Remove g++ from the containers (except for the MinGW one) tests/lcitool: Remove 'xfsprogs' from QEMU tests/lcitool/refresh: Treat the output of lcitool as text, not as bytes Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'tests/lcitool/refresh')
| -rwxr-xr-x | tests/lcitool/refresh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 24a735a3f2..789acefb75 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -43,12 +43,12 @@ def atomic_write(filename, content): def generate(filename, cmd, trailer): print("Generate %s" % filename) - lcitool = subprocess.run(cmd, capture_output=True) + lcitool = subprocess.run(cmd, capture_output=True, encoding='utf8') if lcitool.returncode != 0: raise Exception("Failed to generate %s: %s" % (filename, lcitool.stderr)) - content = lcitool.stdout.decode("utf8") + content = lcitool.stdout if trailer is not None: content += trailer atomic_write(filename, content) @@ -192,6 +192,7 @@ try: "s390x-softmmu,s390x-linux-user")) generate_dockerfile("fedora-win64-cross", "fedora-38", + project='qemu,qemu-win-installer', cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", "x86_64-softmmu")) |