kernel32/tests: On Windows 8 DATE_LONGDATE does not output a leading 0 for the day.

Francois Gouget fgouget at free.fr
Fri Nov 1 04:21:15 CDT 2013


---

This only fixes the date-related test failure.

 dlls/kernel32/tests/locale.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index bbb7d23..918a664 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -662,10 +662,12 @@ static void test_GetDateFormatA(void)
   if (strncmp(buffer, Expected, strlen(Expected)) && strncmp(buffer, "5/4/02", strlen(Expected)) != 0)
 	  ok (0, "Expected '%s' or '5/4/02', got '%s'\n", Expected, buffer);
 
-  STRINGSA("ddd',' MMM dd ''''yy", "Saturday, May 04, 2002"); /* DATE_LONGDATE */
+  SetLastError(0xdeadbeef); buffer[0] = '\0'; /* DATE_LONGDATE */
   ret = GetDateFormatA(lcid, NUO|DATE_LONGDATE, &curtime, NULL, buffer, COUNTOF(buffer));
   ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError());
-  EXPECT_LENA; EXPECT_EQA;
+  ok(strcmp(buffer, "Saturday, May 04, 2002") == 0 ||
+     strcmp(buffer, "Saturday, May 4, 2002") == 0 /* Win 8 */,
+     "got an unexpected date string '%s'\n", buffer);
 
   /* test for expected DATE_YEARMONTH behavior with null format */
   /* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */
-- 
1.8.4.rc3




More information about the wine-patches mailing list