[PATCH 1/2] msi/tests: SQLGetInstalledDrivers fails if there are no ODBC drivers installed.

[Hans Leidekker]

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
 dlls/msi/tests/custom.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index cd6cb0c378..c7ce4d20ae 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -1424,9 +1424,10 @@ UINT WINAPI odbc_present(MSIHANDLE hinst)
     WORD len;
     BOOL r;
 
+    buffer[0] = 0;
+    len = sizeof(buffer);
     r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len);
-    ok(hinst, len < sizeof(buffer), "buffer too small\n");
-    ok(hinst, r, "SQLGetInstalledDrivers failed\n");
+    if (r) ok(hinst, len < sizeof(buffer), "buffer too small\n");
     for (p = buffer; *p; p += strlen(p) + 1)
     {
         if (!strcmp(p, "ODBC test driver"))
@@ -1446,9 +1447,10 @@ UINT WINAPI odbc_absent(MSIHANDLE hinst)
     WORD len;
     BOOL r;
 
+    buffer[0] = 0;
+    len = sizeof(buffer);
     r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len);
-    ok(hinst, len < sizeof(buffer), "buffer too small\n");
-    ok(hinst, r, "SQLGetInstalledDrivers failed\n");
+    if (r) ok(hinst, len < sizeof(buffer), "buffer too small\n");
     for (p = buffer; *p; p += strlen(p) + 1)
     {
         if (!strcmp(p, "ODBC test driver"))
-- 
2.11.0

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=42605

Your paranoid android.


=== w7u (32 bit Windows report) ===

msi:
action: Timeout

=== w7u (32 bit Windows report) ===

msi:
install: Timeout

=== w7u (task log) ===

Task errors:
The task timed out

=== w7u (32 bit Windows report) ===

msi:
msi: Timeout

=== debian9 (build log) ===