fusion/tests: Use win_skip() to skip over unimplemented functionality.
This commit is contained in:
parent
9de60b9c2c
commit
b7a6cc3676
|
@ -759,14 +759,14 @@ static BOOL init_functionpointers(void)
|
||||||
hmscoree = LoadLibraryA("mscoree.dll");
|
hmscoree = LoadLibraryA("mscoree.dll");
|
||||||
if (!hmscoree)
|
if (!hmscoree)
|
||||||
{
|
{
|
||||||
skip("mscoree.dll not available\n");
|
win_skip("mscoree.dll not available\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim");
|
pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim");
|
||||||
if (!pLoadLibraryShim)
|
if (!pLoadLibraryShim)
|
||||||
{
|
{
|
||||||
skip("LoadLibraryShim not available\n");
|
win_skip("LoadLibraryShim not available\n");
|
||||||
FreeLibrary(hmscoree);
|
FreeLibrary(hmscoree);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -774,7 +774,7 @@ static BOOL init_functionpointers(void)
|
||||||
hr = pLoadLibraryShim(szFusion, NULL, NULL, &hfusion);
|
hr = pLoadLibraryShim(szFusion, NULL, NULL, &hfusion);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
skip("fusion.dll not available\n");
|
win_skip("fusion.dll not available\n");
|
||||||
FreeLibrary(hmscoree);
|
FreeLibrary(hmscoree);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -784,7 +784,7 @@ static BOOL init_functionpointers(void)
|
||||||
|
|
||||||
if (!pCreateAssemblyCache || !pGetCachePath)
|
if (!pCreateAssemblyCache || !pGetCachePath)
|
||||||
{
|
{
|
||||||
skip("fusion.dll not implemented\n");
|
win_skip("fusion.dll not implemented\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,14 +52,14 @@ static BOOL init_functionpointers(void)
|
||||||
hmscoree = LoadLibraryA("mscoree.dll");
|
hmscoree = LoadLibraryA("mscoree.dll");
|
||||||
if (!hmscoree)
|
if (!hmscoree)
|
||||||
{
|
{
|
||||||
skip("mscoree.dll not available\n");
|
win_skip("mscoree.dll not available\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim");
|
pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim");
|
||||||
if (!pLoadLibraryShim)
|
if (!pLoadLibraryShim)
|
||||||
{
|
{
|
||||||
skip("LoadLibraryShim not available\n");
|
win_skip("LoadLibraryShim not available\n");
|
||||||
FreeLibrary(hmscoree);
|
FreeLibrary(hmscoree);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -67,7 +67,7 @@ static BOOL init_functionpointers(void)
|
||||||
hr = pLoadLibraryShim(szFusion, NULL, NULL, &hfusion);
|
hr = pLoadLibraryShim(szFusion, NULL, NULL, &hfusion);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
skip("fusion.dll not available\n");
|
win_skip("fusion.dll not available\n");
|
||||||
FreeLibrary(hmscoree);
|
FreeLibrary(hmscoree);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -79,7 +79,7 @@ static BOOL init_functionpointers(void)
|
||||||
if (!pCreateAssemblyEnum ||
|
if (!pCreateAssemblyEnum ||
|
||||||
!pCreateAssemblyNameObject || !pGetCachePath)
|
!pCreateAssemblyNameObject || !pGetCachePath)
|
||||||
{
|
{
|
||||||
skip("fusion.dll not implemented\n");
|
win_skip("fusion.dll not implemented\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -777,7 +777,7 @@ START_TEST(asmname)
|
||||||
{
|
{
|
||||||
if (!init_functionpointers())
|
if (!init_functionpointers())
|
||||||
{
|
{
|
||||||
skip("fusion.dll not available\n");
|
win_skip("fusion.dll not available\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,14 +48,14 @@ static BOOL init_functionpointers(void)
|
||||||
hmscoree = LoadLibraryA("mscoree.dll");
|
hmscoree = LoadLibraryA("mscoree.dll");
|
||||||
if (!hmscoree)
|
if (!hmscoree)
|
||||||
{
|
{
|
||||||
skip("mscoree.dll not available\n");
|
win_skip("mscoree.dll not available\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim");
|
pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim");
|
||||||
if (!pLoadLibraryShim)
|
if (!pLoadLibraryShim)
|
||||||
{
|
{
|
||||||
skip("LoadLibraryShim not available\n");
|
win_skip("LoadLibraryShim not available\n");
|
||||||
FreeLibrary(hmscoree);
|
FreeLibrary(hmscoree);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@ static BOOL init_functionpointers(void)
|
||||||
hr = pLoadLibraryShim(szFusion, NULL, NULL, &hfusion);
|
hr = pLoadLibraryShim(szFusion, NULL, NULL, &hfusion);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
skip("fusion.dll not available\n");
|
win_skip("fusion.dll not available\n");
|
||||||
FreeLibrary(hmscoree);
|
FreeLibrary(hmscoree);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -91,7 +91,7 @@ static void test_GetCachePath(void)
|
||||||
|
|
||||||
if (!pGetCachePath)
|
if (!pGetCachePath)
|
||||||
{
|
{
|
||||||
skip("GetCachePath not implemented\n");
|
win_skip("GetCachePath not implemented\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue