[PATCH v2] oleaut32/tests: Mark some tmarshal tests as todo on x64 and ARM

Huw Davies huw at codeweavers.com
Tue Feb 13 02:38:08 CST 2018


On Mon, Feb 12, 2018 at 07:48:59PM -0700, Alex Henrie wrote:
> Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
> ---
>  dlls/oleaut32/tests/tmarshal.c | 68 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 68 insertions(+)
> 
> diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c
> index 67b8e22642..b716461bd6 100644
> --- a/dlls/oleaut32/tests/tmarshal.c
> +++ b/dlls/oleaut32/tests/tmarshal.c
> @@ -1305,6 +1305,9 @@ static void test_typelibmarshal(void)
>  
>      IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL);
>      hr = CoUnmarshalInterface(pStream, &IID_IKindaEnumWidget, (void **)&pKEW);
> +#ifndef __i386__
> +    todo_wine
> +#endif
>      ok_ole_success(hr, CoUnmarshalInterface);
>      IStream_Release(pStream);
>  

Scattering #ifdefs throughout the code looks pretty ugly.
How about:

#ifdef __i386__
static const int tmarshal_todo = 0;
#else
static const int tmarshal_todo = 1;
#endif

then

todo_wine_if(tmarshal_todo)
    ok_ole_success(hr, CoUnmarshalInterface);

Huw.



More information about the wine-devel mailing list