diff options
| author | Peter Maydell | 2018-07-24 18:51:36 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-24 18:51:36 +0200 |
| commit | debe96fdeca911247d4b4862ce0a2a5bc27d6b35 (patch) | |
| tree | aedfa592cee91f1cde2d85901130c211798d4c99 /stubs/error-printf.c | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | tests: fix TLS handshake failure with TLS 1.3 (diff) | |
| download | qemu-debe96fdeca911247d4b4862ce0a2a5bc27d6b35.tar.gz qemu-debe96fdeca911247d4b4862ce0a2a5bc27d6b35.tar.xz qemu-debe96fdeca911247d4b4862ce0a2a5bc27d6b35.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging
Fix unit test compatibility with TLS 1.3
# gpg: Signature made Tue 24 Jul 2018 17:44:14 BST
# gpg: using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/qcrypto-next-pull-request:
tests: fix TLS handshake failure with TLS 1.3
tests: use error_abort in places expecting errors
tests: don't silence error reporting for all tests
tests: call qcrypto_init instead of gnutls_global_init
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'stubs/error-printf.c')
| -rw-r--r-- | stubs/error-printf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stubs/error-printf.c b/stubs/error-printf.c index ac6b92aa69..99c6406668 100644 --- a/stubs/error-printf.c +++ b/stubs/error-printf.c @@ -4,7 +4,8 @@ void error_vprintf(const char *fmt, va_list ap) { - if (g_test_initialized() && !g_test_subprocess()) { + if (g_test_initialized() && !g_test_subprocess() && + getenv("QTEST_SILENT_ERRORS")) { char *msg = g_strdup_vprintf(fmt, ap); g_test_message("%s", msg); g_free(msg); |