More regression errors ...

Paul Millar paulm at astro.gla.ac.uk
Wed May 29 07:30:56 CDT 2002


Hi,

I've noticed that amongst last night's slew of patches, Mehmet's
regression tests were applied without his patches that correct wine's
behaviour. Wine now fails regression tests on all platforms.

If his patches are delayed for some reason, could/should we use todo_wine
to acknowledge that these failures are known? If so, I've attached a
trivial patch to do this for the tests that failed for me ...

ChangeLog:
   Mark failing regression tests as todo

Cheers,

----
Paul Millar


-------------- next part --------------
Index: dlls/kernel/tests/locale.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/locale.c,v
retrieving revision 1.1
diff -u -r1.1 locale.c
--- dlls/kernel/tests/locale.c	29 May 2002 00:30:32 -0000	1.1
+++ dlls/kernel/tests/locale.c	29 May 2002 11:01:58 -0000
@@ -64,8 +64,11 @@
 	memset( buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) );
 	ret = GetLocaleInfoA(lcid, LOCALE_SDAYNAME1, buffer, 3);
 	cmp = strncmp (buffer, Expected, strlen(Expected));
-	ok (cmp == 0, "GetLocaleInfoA got %s instead of %s", buffer, Expected);
-	eq (ret, 0, "GetLocaleInfoA with len = 3", "%d");
+	todo_wine {
+            ok (cmp == 0, "GetLocaleInfoA got %s instead of %s", buffer,
+                Expected);
+            eq (ret, 0, "GetLocaleInfoA with len = 3", "%d");
+        }
 			
 	strcpy(Expected, "Monday");
 	memset( buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) );
@@ -101,8 +104,11 @@
 	memset(&curtime, 2, sizeof(SYSTEMTIME));
 	ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, format, buffer, sizeof(buffer));
 	error = GetLastError ();
-	ok (ret == 0, "GetTimeFormat should fail on dummy data");
-	eq (error, ERROR_INVALID_PARAMETER, "GetTimeFormat GetLastError()", "%d");
+	todo_wine {
+          ok (ret == 0, "GetTimeFormat should fail on dummy data");
+          eq (error, ERROR_INVALID_PARAMETER, "GetTimeFormat GetLastError()",
+              "%d");
+        }
 
 	strcpy(Expected, "AM 08:56 at 13");
 	curtime.wHour = 8;  curtime.wMinute = 56; 
@@ -118,13 +124,15 @@
 	ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, format, buffer, 0);
 	cmp = strncmp (Expected, buffer, 4);
 	ok (cmp == 0, "GetTimeFormat with len=0 got %s instead of %s", buffer, Expected);
-	eq (ret, 12, "GetTimeFormat with len=0", "%d");
+	todo_wine eq (ret, 12, "GetTimeFormat with len=0", "%d");
 
 	memset(buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) );
 	strcpy(Expected, "AMxx");
 	ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, format, buffer, 2);
 	cmp = strncmp (Expected, buffer, 4);
-	ok (cmp == 0, "GetTimeFormat with len=2 got %s instead of %s", buffer, Expected);
+	todo_wine ok (cmp == 0,
+                      "GetTimeFormat with len=2 got %s instead of %s",
+                      buffer, Expected);
 	eq (ret, 0, "GetTimeFormat with len=0", "%d");
 }
 
@@ -143,8 +151,10 @@
 	memset(buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) );
 	ret = GetDateFormatA(lcid, 0, &curtime, format, buffer, sizeof(buffer));
 	error = GetLastError ();
-	ok (ret== 0, "GetDateFormat should fail on dummy data");
-	eq (error, ERROR_INVALID_PARAMETER, "GetDateFormat", "%d");
+	todo_wine {
+            ok (ret== 0, "GetDateFormat should fail on dummy data");
+            eq (error, ERROR_INVALID_PARAMETER, "GetDateFormat", "%d");
+        }
 
 	strcpy(Expected, "Sat, May 04 02");
 	memset(buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) );
@@ -154,7 +164,8 @@
 	curtime.wDayOfWeek = 3;
 	ret = GetDateFormatA(lcid, 0, &curtime, format, buffer, sizeof(buffer));
 	cmp = strncmp (Expected, buffer, strlen(Expected)+1);
-	ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer, Expected);
+	todo_wine ok (cmp == 0,
+                      "GetDateFormat got %s instead of %s", buffer, Expected);
 	eq (ret, strlen(Expected)+1, "GetDateFormat", "%d");
 
 	/* test format with "'" */
@@ -163,7 +174,8 @@
 	strcpy(Expected, "Sat, May 04 '02");
 	ret = GetDateFormatA(lcid, 0, &curtime, format, buffer, sizeof(buffer));
 	cmp = strncmp (Expected, buffer, strlen(Expected)+1);
-	ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer, Expected);
+	todo_wine ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer,
+                      Expected);
 	eq (ret, (strlen(Expected)+1), "GetDateFormat", "%d");
 
 	/* test with too small buffers */
@@ -172,13 +184,14 @@
 	ret = GetDateFormatA(lcid, 0, &curtime, format, buffer, 0);
 	cmp = strncmp (Expected, buffer, 4);
 	ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer, Expected);
-	eq (ret, 16, "GetDateFormat with len=0", "%d");
+	todo_wine eq (ret, 16, "GetDateFormat with len=0", "%d");
 
 	memset(buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) );
 	strcpy(Expected, "Saxx");
 	ret = GetDateFormatA(lcid, 0, &curtime, format, buffer, 2);
 	cmp = strncmp (Expected, buffer, 4);
-	ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer, Expected);
+	todo_wine ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer,
+                      Expected);
 	eq (ret, 0, "GetDateFormat with len=2", "%d");
 }
 
@@ -213,15 +226,21 @@
 	memset( buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) );
 	ret = GetCurrencyFormatA(lcid, 0, format, NULL, buffer, 2);
 	cmp = strncmp ("$2xx", buffer, 4);
-	ok (cmp == 0, "GetCurrencyFormat got %s instead of %s", buffer, Expected);
-	eq (ret, 0, "GetCurrencyFormat with len=2", "%d");
+	todo_wine {
+            ok (cmp == 0, "GetCurrencyFormat got %s instead of %s", buffer,
+                Expected);
+            eq (ret, 0, "GetCurrencyFormat with len=2", "%d");
+        }
 
 	/* We check the whole buffer with strncmp */
 	memset( buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) );
 	ret = GetCurrencyFormatA(lcid, 0, format, NULL, buffer, sizeof(buffer));
 	cmp = strncmp (Expected, buffer, BUFFER_SIZE);
-	ok (cmp == 0, "GetCurrencyFormat got %s instead of %s", buffer, Expected);
-	eq (ret, strlen(Expected)+1, "GetCurrencyFormat","%d");
+        todo_wine {
+            ok (cmp == 0, "GetCurrencyFormat got %s instead of %s", buffer,
+                Expected);
+            eq (ret, strlen(Expected)+1, "GetCurrencyFormat","%d");
+        }
 
 }
 
@@ -254,8 +273,11 @@
 	memset( buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) );
 	ret = GetNumberFormatA(lcid, 0, input, NULL, buffer, 2);
 	cmp = strncmp (Expected, buffer, 4);
-	ok (cmp == 0, "GetNumberFormat with len=2 got %s instead of %s", buffer, Expected);
-	eq (ret, 0, "GetNumberFormat", "%d");
+        todo_wine {
+            ok (cmp == 0, "GetNumberFormat with len=2 got %s instead of %s",
+                buffer, Expected);
+            eq (ret, 0, "GetNumberFormat", "%d");
+        }
 
 	/* We check the whole buffer with strncmp */
 	memset(Expected, 'x', sizeof (Expected)/sizeof(Expected[0]) );
@@ -264,7 +286,7 @@
 	ret = GetNumberFormatA(lcid, 0, input, NULL, buffer, sizeof(buffer));
 	cmp = strncmp (Expected, buffer, BUFFER_SIZE);
 	ok (cmp == 0, "GetNumberFormat got %s instead of %s", buffer, Expected);
-	eq (ret, strlen(Expected)+1, "GetNumberFormat", "%d");
+	todo_wine eq (ret, strlen(Expected)+1, "GetNumberFormat", "%d");
 }
 
 
@@ -309,7 +331,9 @@
 
 	strcpy(buffer1, "Salut"); strcpy(buffer2, "saLuT");
 	ret = CompareStringA(lcid, NORM_IGNORECASE, buffer1, BUFFER_SIZE, buffer2, BUFFER_SIZE);
-	ok (ret== 2, "CompareStringA (st1=%s str2=%s) expected result=2", buffer1, buffer2);
+        todo_wine ok (ret== 2,
+                      "CompareStringA (st1=%s str2=%s) expected result=2",
+                      buffer1, buffer2);
 
 	strcpy(buffer1, "Salut"); strcpy(buffer2, "hola");
 	ret = CompareStringA(lcid, NORM_IGNORECASE, buffer1, BUFFER_SIZE, buffer2, BUFFER_SIZE);


More information about the wine-devel mailing list