Commit f803e9d3 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

fusion/tests: Skip tests on .NET 1.1.

parent 54b2984d
...@@ -835,6 +835,32 @@ static void create_assembly(LPCSTR file) ...@@ -835,6 +835,32 @@ static void create_assembly(LPCSTR file)
CloseHandle(hfile); CloseHandle(hfile);
} }
static BOOL check_dotnet20(void)
{
IAssemblyCache *cache;
HRESULT hr;
BOOL ret = FALSE;
static const WCHAR winedll[] = {'w','i','n','e','.','d','l','l',0};
create_assembly("wine.dll");
hr = pCreateAssemblyCache(&cache, 0);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
hr = IAssemblyCache_InstallAssembly(cache, 0, winedll, NULL);
if (hr == S_OK)
ret = TRUE;
else if (hr == CLDB_E_FILE_OLDVER)
win_skip("Tests can't be run on older .NET version (.NET 1.1)\n");
else
ok(0, "Expected S_OK, got %08x\n", hr);
DeleteFileA("wine.dll");
IAssemblyCache_Release(cache);
return ret;
}
static void test_CreateAssemblyCache(void) static void test_CreateAssemblyCache(void)
{ {
IAssemblyCache *cache; IAssemblyCache *cache;
...@@ -1464,6 +1490,9 @@ START_TEST(asmcache) ...@@ -1464,6 +1490,9 @@ START_TEST(asmcache)
if (!init_functionpointers()) if (!init_functionpointers())
return; return;
if (!check_dotnet20())
return;
test_CreateAssemblyCache(); test_CreateAssemblyCache();
test_InstallAssembly(); test_InstallAssembly();
test_QueryAssemblyInfo(); test_QueryAssemblyInfo();
......
...@@ -121,4 +121,6 @@ ...@@ -121,4 +121,6 @@
#define FUSION_E_INVALID_NAME EMAKEHR(0x1047) #define FUSION_E_INVALID_NAME EMAKEHR(0x1047)
#define CLDB_E_FILE_OLDVER EMAKEHR(0x1107)
#endif /* __WINE_CORERROR_H */ #endif /* __WINE_CORERROR_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment