diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-23 11:27:44 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-23 11:27:44 +0000 |
commit | 6ab64cc2a51dd30f4b19eba707f5bfcba0524a0a (patch) | |
tree | a585109df5d6a7331464e2158fb247e67c4d6936 /python/qemu/machine.py | |
parent | 8cc30eb1400fc01f2b139cdd3dc524f8b84dbe07 (diff) | |
parent | 534f80e1dffbf520bed9bf5fd5ae98de6662e126 (diff) | |
download | qemu-6ab64cc2a51dd30f4b19eba707f5bfcba0524a0a.zip qemu-6ab64cc2a51dd30f4b19eba707f5bfcba0524a0a.tar.gz qemu-6ab64cc2a51dd30f4b19eba707f5bfcba0524a0a.tar.bz2 |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-for-5.2-rc3-231120-1' into staging
Misc CI fixes:
- more helpful logic for git-pipeline-status
- fix tempdir leak in avocado
- move remaining x86 check-tcg to gitlab
- add tracing headers to ubuntu2004 docker
- move tracing backend tests to gitlab
- bump up timeouts on cirrus MacOS
# gpg: Signature made Mon 23 Nov 2020 09:58:18 GMT
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-for-5.2-rc3-231120-1:
.cirrus.yml: bump timeout period for MacOS builds
gitlab-ci: Move trace backend tests across to gitlab
tests/docker: Install liblttng-ust-dev package in Ubuntu 20.04 image
gitlab: move remaining x86 check-tcg targets to gitlab
tests/avocado: clean-up socket directory after run
tests: add prefixes to the bare mkdtemp calls
scripts/ci: clean up default args logic a little
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'python/qemu/machine.py')
-rw-r--r-- | python/qemu/machine.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 6420f01..64d966a 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -303,7 +303,8 @@ class QEMUMachine: return args def _pre_launch(self) -> None: - self._temp_dir = tempfile.mkdtemp(dir=self._test_dir) + self._temp_dir = tempfile.mkdtemp(prefix="qemu-machine-", + dir=self._test_dir) self._qemu_log_path = os.path.join(self._temp_dir, self._name + ".log") self._qemu_log_file = open(self._qemu_log_path, 'wb') |