Juan Lang : odbccp32: Fix a couple failing tests, and log more information about remaining failures.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 401b1b36ccb90d109bbb5d267f8635ad55d36dd2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=401b1b36ccb90d109bbb5d267f...

Author: Juan Lang 
Date:   Fri Feb 13 09:53:50 2009 -0800

odbccp32: Fix a couple failing tests, and log more information about remaining failures.

---

dlls/odbccp32/tests/misc.c |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c
index ba8e5f4..044846c 100644
--- a/dlls/odbccp32/tests/misc.c
+++ b/dlls/odbccp32/tests/misc.c
@@ -112,14 +112,24 @@ static void test_SQLInstallDriverManager(void)
     /* Length OK */
     bool_ret = SQLInstallDriverManager(target_path, MAX_PATH, NULL);
     sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL);
-    ok(bool_ret, "SQLInstallDriverManager unexpectedly failed\n");
-    ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret);
+    ok(bool_ret, "SQLInstallDriverManager unexpectedly failed: %d\n",
+        error_code);
+    if (bool_ret)
+        ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret);
+    else
+        ok(sql_ret == SQL_SUCCESS_WITH_INFO,
+            "Expected SQL_SUCCESS_WITH_INFO, got %d\n", sql_ret);

path_out = 0xcafe;
     bool_ret = SQLInstallDriverManager(target_path, MAX_PATH, &path_out);
     sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL);
-    ok(bool_ret, "SQLInstallDriverManager unexpectedly failed\n");
-    ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret);
+    ok(bool_ret, "SQLInstallDriverManager unexpectedly failed: %d\n",
+        error_code);
+    if (bool_ret)
+        ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret);
+    else
+        ok(sql_ret == SQL_SUCCESS_WITH_INFO,
+            "Expected SQL_SUCCESS_WITH_INFO, got %d\n", sql_ret);
     /* path_out should in practice be less than 0xcafe */
     ok(path_out != 0xcafe, "Expected path_out to show the correct amount of bytes\n");
 }