ieframe/tests: Skip some tests on Windows if WebBrowser is not supported.

Jacek Caban jacek at codeweavers.com
Fri Sep 16 08:31:12 CDT 2011


On 09/16/11 15:25, Francois Gouget wrote:
> ---
>
> This fixes this test on the WNT4WSSP6 testbot machine.
> It also helps on my NT4 VM but one would not notice because there's no
> ieframes dll so WineTest does not even try to run this test!
>
>   dlls/ieframe/tests/webbrowser.c |    5 ++++-
>   1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c
> index a36c134..0506be6 100644
> --- a/dlls/ieframe/tests/webbrowser.c
> +++ b/dlls/ieframe/tests/webbrowser.c
> @@ -212,7 +212,10 @@ static HRESULT _create_WebBrowser(unsigned line, IUnknown **unk)
>
>       hres = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
>               &IID_IUnknown, (void**)unk);
> -    ok_(__FILE__,line)(hres == S_OK, "Creating WebBrowser object failed: %08x\n", hres);
> +    if (hres == REGDB_E_CLASSNOTREG)
> +        win_skip_(__FILE__,line)("WebBrowser is not supported\n");
> +    else
> +        ok_(__FILE__,line)(hres == S_OK, "Creating WebBrowser object failed: %08x\n", hres);
>       return hres;
>   }

The failure is valid here, it's the testbot that is not smart enough. 
The tested DLL is not present on WINNT, so the test should be skipped 
automatically, like winetest does.

Jacek



More information about the wine-devel mailing list