diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-09-06 12:38:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-09-06 12:38:07 +0100 |
| commit | 935efca6c246c108253b0e4e51cc87648fc7ca10 (patch) | |
| tree | e910c5f35673968d71e7e7aae15d0ead9fff34e3 /tests | |
| parent | 88afdc92b644120e0182c8567e1b1d236e471b12 (diff) | |
| parent | 6695e4c0fd9ef05bf6ab8e3402d5bc95b39c4cf3 (diff) | |
Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-09-06' into staging
* Add definitions of terms for CI/testing
* Fix g_setenv problem discovered by Coverity
* Gitlab CI improvements
* Build system improvements (configure script + meson.build)
* Removal of the show-fixed-bugs.sh script
* Clean up of the sdl and curses options
# gpg: Signature made Mon 06 Sep 2021 10:51:49 BST
# 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 <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/thuth-gitlab/tags/pull-request-2021-09-06:
softmmu/vl: Deprecate the -sdl and -curses option
softmmu/vl: Deprecate the old grab options
softmmu/vl: Add a "grab-mod" parameter to the -display sdl option
scripts: Remove the "show-fixed-bugs.sh" file
configure / meson: Move the GBM handling to meson.build
meson.build: Don't use internal libfdt if the user requested the system libfdt
meson.build: Fix the check for a usable libfdt
gitlab-ci: Don't try to use the system libfdt in the debian job
libqtest: check for g_setenv() failure
docs: add definitions of terms for CI/testing
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qtest/libqtest.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 825b13a44c..73f6b977a6 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -301,7 +301,9 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args) s->expected_status = 0; s->qemu_pid = fork(); if (s->qemu_pid == 0) { - g_setenv("QEMU_AUDIO_DRV", "none", true); + if (!g_setenv("QEMU_AUDIO_DRV", "none", true)) { + exit(1); + } execlp("/bin/sh", "sh", "-c", command, NULL); exit(1); } |