On Fri, Jul 07, 2017 at 08:33:19AM +0200, Thomas Huth wrote:
> On 07.07.2017 01:49, Alistair Francis wrote:
> > Convert all uses of error_report("[Ww]arning:"... to use warn_report()
> > instead. This helps standardise on a single method of printing warnings
> > to the user.
> >
> > All of the warnings were found using this regex expression:
> > error_report.*[Ww]arning:
> > and replaced with:
> > warn_report("
> [...]
> > 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("");
> > }
>
> These changes are unrelated ... please drop them from your patch.
Are they? I believe they are necessary so the test case won't be
broken by the qdev-properties.c changes.
--
Eduardo
