Austin English : mscoree/tests: Fix a broken test (LLVM/Clang).
Alexandre Julliard
julliard at winehq.org
Thu Dec 23 11:28:05 CST 2010
Module: wine
Branch: master
Commit: cccc36e25a83336a996362f7652e839338718787
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cccc36e25a83336a996362f7652e839338718787
Author: Austin English <austinenglish at gmail.com>
Date: Wed Dec 22 22:27:55 2010 -0800
mscoree/tests: Fix a broken test (LLVM/Clang).
---
dlls/mscoree/tests/mscoree.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c
index 0155fdd..4226493 100644
--- a/dlls/mscoree/tests/mscoree.c
+++ b/dlls/mscoree/tests/mscoree.c
@@ -115,7 +115,7 @@ static void test_versioninfo(void)
trace(" installed in directory %s is .net version %s\n", wine_dbgstr_w(path), wine_dbgstr_w(version));
hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, &size);
- ok(hr == S_OK || CLR_E_SHIM_RUNTIME /*v1_1 not installed*/, "GetRequestedRuntimeInfo returned %08x\n", hr);
+ ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME /*v1_1 not installed*/, "GetRequestedRuntimeInfo returned %08x\n", hr);
if(hr == S_OK)
trace(" installed in directory %s is .net version %s\n", wine_dbgstr_w(path), wine_dbgstr_w(version));
/* version number NULL not allowed without RUNTIME_INFO_UPGRADE_VERSION flag */
More information about the wine-cvs
mailing list