From 807998ed4c564940b448e0b3ea4dc7e1b6268cbe Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Tue, 1 Apr 2014 16:42:13 +0200 Subject: [PATCH] shell32/tests: Mark some test results as broken. --- dlls/shell32/tests/shlexec.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index c18d1455402..9f4b1a385a8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -747,10 +747,19 @@ static void _okChildInt(const char* file, int line, const char* key, int expecte "%s expected %d, but got %d\n", key, expected, result); } +static void _okChildIntBroken(const char* file, int line, const char* key, int expected) +{ + INT result; + result=GetPrivateProfileIntA("Arguments", key, expected, child_file); + ok_(file, line)(result == expected || broken(result != expected), + "%s expected %d, but got %d\n", key, expected, result); +} + #define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected), (expected)) #define okChildStringBroken(key, expected, broken) _okChildString(__FILE__, __LINE__, (key), (expected), (broken)) #define okChildPath(key, expected) _okChildPath(__FILE__, __LINE__, (key), (expected)) -#define okChildInt(key, expected) _okChildInt(__FILE__, __LINE__, (key), (expected)) +#define okChildInt(key, expected) _okChildInt(__FILE__, __LINE__, (key), (expected)) +#define okChildIntBroken(key, expected) _okChildIntBroken(__FILE__, __LINE__, (key), (expected)) /*** * @@ -2118,6 +2127,7 @@ typedef struct const char* ifexec; int expectedArgs; const char* expectedDdeExec; + BOOL broken; } dde_tests_t; static dde_tests_t dde_tests[] = @@ -2134,7 +2144,7 @@ static dde_tests_t dde_tests[] = /* Test unquoted %1 in command and ddeexec * (test filename has space) */ - {"%1", "[open(%1)]", "shlexec", "dde", NULL, 2, "[open(%s)]"}, + {"%1", "[open(%1)]", "shlexec", "dde", NULL, 2, "[open(%s)]", TRUE /* before vista */}, /* Test ifexec precedence over ddeexec */ {"", "[open(\"%1\")]", "shlexec", "dde", "[ifexec(\"%1\")]", FALSE, "[ifexec(\"%s\")]"}, @@ -2269,7 +2279,10 @@ static void test_dde(void) if (32 < rc) { - okChildInt("argcA", test->expectedArgs + 3); + if (test->broken) + okChildIntBroken("argcA", test->expectedArgs + 3); + else + okChildInt("argcA", test->expectedArgs + 3); if (test->expectedArgs == 1) okChildPath("argvA3", filename);