diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-14 09:36:40 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-14 09:36:40 +0100 |
| commit | a309b290aaa8ac55191a50e44bbd99b5fc586487 (patch) | |
| tree | 3798999e5f6d795f6987dcedb7c396fdd3011fa0 /tests/test-qdev-global-props.c | |
| parent | 49bcce4b9c11759678fd223aefb48691c4959d4f (diff) | |
| parent | 88f83f3539fdedd5f315c5fe434ffcb7a010cc73 (diff) | |
| download | focaccia-qemu-a309b290aaa8ac55191a50e44bbd99b5fc586487.tar.gz focaccia-qemu-a309b290aaa8ac55191a50e44bbd99b5fc586487.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2017-07-13' into staging
Error reporting patches for 2017-07-13 # gpg: Signature made Thu 13 Jul 2017 12:55:45 BST # gpg: using RSA key 0x3870B400EB918653 # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-error-2017-07-13: Convert error_report*_err() to warn_report*_err() error: Implement the warn and free Error functions char-socket: Report TCP socket waiting as information Convert error_report() to warn_report() error: Functions to report warnings and informational messages util/qemu-error: Rename error_print_loc() to be more generic websock: Don't try to set *errp directly block: Don't try to set *errp directly xilinx: Fix latent error handling bug Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/test-qdev-global-props.c')
| -rw-r--r-- | tests/test-qdev-global-props.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c index 48e5b7315f..b25fe892ed 100644 --- a/tests/test-qdev-global-props.c +++ b/tests/test-qdev-global-props.c @@ -232,10 +232,10 @@ static void test_dynamic_globalprop(void) g_test_trap_assert_passed(); g_test_trap_assert_stderr_unmatched("*prop1*"); g_test_trap_assert_stderr_unmatched("*prop2*"); - g_test_trap_assert_stderr("*Warning: global dynamic-prop-type-bad.prop3 has invalid class name\n*"); + g_test_trap_assert_stderr("*warning: global dynamic-prop-type-bad.prop3 has invalid class name\n*"); g_test_trap_assert_stderr_unmatched("*prop4*"); - g_test_trap_assert_stderr("*Warning: global nohotplug-type.prop5=105 not used\n*"); - g_test_trap_assert_stderr("*Warning: global nondevice-type.prop6 has invalid class name\n*"); + g_test_trap_assert_stderr("*warning: global nohotplug-type.prop5=105 not used\n*"); + g_test_trap_assert_stderr("*warning: global nondevice-type.prop6 has invalid class name\n*"); g_test_trap_assert_stdout(""); } |