mscoree/tests: Don't expect a 2.x runtime
André Hentschel
nerv at dawncrow.de
Tue Nov 12 17:08:01 CST 2013
This way only the available runtimes are tested in test_getruntime, see win8 test failures, it has no 2.x runtime anymore
---
dlls/mscoree/tests/metahost.c | 80 ++++++++++++++++++++++++-------------------
1 file changed, 44 insertions(+), 36 deletions(-)
diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c
index 7794e74..bc20757 100644
--- a/dlls/mscoree/tests/metahost.c
+++ b/dlls/mscoree/tests/metahost.c
@@ -64,6 +64,48 @@ static void cleanup(void)
FreeLibrary(hmscoree);
}
+static WCHAR* mystrrchrW(WCHAR *str, WCHAR ch)
+{
+ WCHAR *pos = NULL, *current = str;
+ while(*current != 0) {
+ if(*current == ch)
+ pos = current;
+ ++current;
+ }
+ return pos;
+}
+
+static void test_getruntime(WCHAR *version)
+{
+ static const WCHAR dotzero[] = {'.','0',0};
+ WCHAR *dot;
+ HRESULT hr;
+ ICLRRuntimeInfo *info;
+ DWORD count;
+ WCHAR buf[MAX_PATH];
+
+ hr = ICLRMetaHost_GetRuntime(metahost, NULL, &IID_ICLRRuntimeInfo, (void**)&info);
+ ok(hr == E_POINTER, "GetVersion failed, hr=%x\n", hr);
+
+ hr = ICLRMetaHost_GetRuntime(metahost, version, &IID_ICLRRuntimeInfo, (void**)&info);
+ ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr);
+ if (hr != S_OK) return;
+
+ count = MAX_PATH;
+ hr = ICLRRuntimeInfo_GetVersionString(info, buf, &count);
+ ok(hr == S_OK, "GetVersionString returned %x\n", hr);
+ ok(count == lstrlenW(buf)+1, "GetVersionString returned count %u but string of length %u\n", count, lstrlenW(buf)+1);
+ ok(lstrcmpW(buf, version) == 0, "got unexpected version %s\n", wine_dbgstr_w(buf));
+
+ ICLRRuntimeInfo_Release(info);
+
+ /* Versions must match exactly. */
+ dot = mystrrchrW(version, '.');
+ lstrcpyW(dot, dotzero);
+ hr = ICLRMetaHost_GetRuntime(metahost, version, &IID_ICLRRuntimeInfo, (void**)&info);
+ ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%x\n", hr);
+}
+
static void test_enumruntimes(void)
{
IEnumUnknown *runtime_enum;
@@ -100,8 +142,9 @@ static void test_enumruntimes(void)
trace("runtime found: %s\n", wine_dbgstr_w(buf));
ICLRRuntimeInfo_Release(runtime_info);
-
IUnknown_Release(unk);
+
+ test_getruntime(buf);
}
ok(hr == S_FALSE, "IEnumUnknown_Next returned %x\n", hr);
@@ -109,39 +152,6 @@ static void test_enumruntimes(void)
IEnumUnknown_Release(runtime_enum);
}
-static void test_getruntime(void)
-{
- static const WCHAR twodotzero[] = {'v','2','.','0','.','5','0','7','2','7',0};
- static const WCHAR twodotzerodotzero[] = {'v','2','.','0','.','0',0};
- HRESULT hr;
- ICLRRuntimeInfo *info;
- DWORD count;
- WCHAR buf[MAX_PATH];
-
- hr = ICLRMetaHost_GetRuntime(metahost, NULL, &IID_ICLRRuntimeInfo, (void**)&info);
- ok(hr == E_POINTER, "GetVersion failed, hr=%x\n", hr);
-
- hr = ICLRMetaHost_GetRuntime(metahost, twodotzero, &IID_ICLRRuntimeInfo, (void**)&info);
- if (hr == CLR_E_SHIM_RUNTIME)
- /* FIXME: Get Mono properly packaged so we can fail here. */
- todo_wine ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr);
- else
- ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr);
- if (hr != S_OK) return;
-
- count = MAX_PATH;
- hr = ICLRRuntimeInfo_GetVersionString(info, buf, &count);
- ok(hr == S_OK, "GetVersionString returned %x\n", hr);
- ok(count == lstrlenW(buf)+1, "GetVersionString returned count %u but string of length %u\n", count, lstrlenW(buf)+1);
- ok(lstrcmpW(buf, twodotzero) == 0, "got unexpected version %s\n", wine_dbgstr_w(buf));
-
- ICLRRuntimeInfo_Release(info);
-
- /* Versions must match exactly. */
- hr = ICLRMetaHost_GetRuntime(metahost, twodotzerodotzero, &IID_ICLRRuntimeInfo, (void**)&info);
- ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%x\n", hr);
-}
-
static void WINAPI notification_callback(ICLRRuntimeInfo *pRuntimeInfo, CallbackThreadSetFnPtr pfnCallbackThreadSet,
CallbackThreadUnsetFnPtr pfnCallbackThreadUnset)
{
@@ -165,8 +175,6 @@ START_TEST(metahost)
return;
test_enumruntimes();
-
- test_getruntime();
test_notification();
cleanup();
--
1.8.1.2
More information about the wine-patches
mailing list