>From f3cff4714c9ae64e9b6b52164299065fbe5e1166 Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Sat, 28 Feb 2009 21:52:36 +0100 Subject: [PATCH] Skip some tests on .NET 1.x --- dlls/fusion/tests/asmname.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 98004ea..b989c37 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -437,7 +437,11 @@ static void test_CreateAssemblyNameObject(void) ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); - test_assembly_name_props(name, defaults); + if (hr == S_OK) + win_skip(".NET 1.x doesn't handle ASM_NAME_PROCESSOR_ID_ARRAY" + " and ASM_NAME_OSINFO_ARRAY correctly\n"); + else + test_assembly_name_props(name, defaults); IAssemblyName_Release(name); @@ -469,7 +473,11 @@ static void test_CreateAssemblyNameObject(void) ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); - test_assembly_name_props(name, emptyname); + if (hr == S_OK) + win_skip(".NET 1.x doesn't handle ASM_NAME_PROCESSOR_ID_ARRAY" + " and ASM_NAME_OSINFO_ARRAY correctly\n"); + else + test_assembly_name_props(name, emptyname); IAssemblyName_Release(name); @@ -502,7 +510,11 @@ static void test_CreateAssemblyNameObject(void) ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); - test_assembly_name_props(name, winename); + if (hr == S_OK) + win_skip(".NET 1.x doesn't handle ASM_NAME_PROCESSOR_ID_ARRAY" + " and ASM_NAME_OSINFO_ARRAY correctly\n"); + else + test_assembly_name_props(name, winename); IAssemblyName_Release(name); -- 1.6.0.6