Re: fusion/tests: Fix tests for .NET 1.x

[Paul Vriens]

Ge van Geldorp wrote:
> Changelog:
>   fusion/tests: Fix tests for .NET 1.x
>
> ---
>  dlls/fusion/tests/asmname.c |   12 +++++++++---
>  1 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c
> index 98004ea..0ea7aa8 100644
> --- a/dlls/fusion/tests/asmname.c
> +++ b/dlls/fusion/tests/asmname.c
> @@ -371,8 +371,12 @@ static void
> test_assembly_name_props_line(IAssemblyName *name,
>              if (i == ASM_NAME_PUBLIC_KEY_TOKEN)
>                  ok(!memcmp(vals[i].val, str, size), "Expected a correct
> ASM_NAME_PUBLIC_KEY_TOKEN\n");
>              else
> -                ok(!lstrcmpA(vals[i].val, val), "%d: prop %d: Expected
> \"%s\", got \"%s\"\n", line, i, vals[i].val, val);
> -            ok(size == vals[i].size, "%d: prop %d: Expected %d, got
> %d\n", line, i, vals[i].size, size);
> +                ok(!lstrcmpA(vals[i].val, val) ||
> +                   broken(i == ASM_NAME_OSINFO_ARRAY), /* .NET 1.x */ +  
>                 "%d: prop %d: Expected \"%s\", got \"%s\"\n", line, i,
> vals[i].val, val);
> +            ok(size == vals[i].size ||
> +               broken(i == ASM_NAME_PROCESSOR_ID_ARRAY || i ==
> ASM_NAME_OSINFO_ARRAY), /* .NET 1.x */
> +               "%d: prop %d: Expected %d, got %d\n", line, i,
> vals[i].size, size);
>          }
>      }
>  }
> @@ -598,7 +602,9 @@ static void test_CreateAssemblyNameObject(void)
>      ok(hr == FUSION_E_INVALID_NAME ||
>         broken(hr == S_OK), /* .NET 1.x */
>         "Expected FUSION_E_INVALID_NAME, got %08x\n", hr);
> -    ok(hi == 0, "Expected 0, got %08x\n", hi);
> +    ok(hi == 0 ||
> +       broken(hi == 0x00010005), /* .NET 1.x */
> +       "Expected 0, got %08x\n", hi);
>      ok(lo == 0, "Expected 0, got %08x\n", lo);
>
> test_assembly_name_props(name, badvername);
> Hi,

Already beat you to it:

http://www.winehq.org/pipermail/wine-patches/2009-February/070044.html
http://www.winehq.org/pipermail/wine-patches/2009-February/070045.html

The main difference is that I skip 3 of the test_assembly_name_props tests 
altogether whereas you 'skip' these 2 properties for all the 
test_assembly_name_props tests.

-- 
Cheers,

Paul.