Re: W2K results from the current tests

[Tony Lambregts <tony_lambregts@telusplanet.net>]

Rolf Kalbermatter wrote:

> As far as I'm concerned I don't see why test results should go to stderr.
> But I do not know about the possible background on Unix platforms for this.
> If you want to do a patch I think this would be helpful and then see if
> Alexandre is committing it ;-)
>
> Rolf Kalbermatter
>
>
>  
Yeah your right....

Change Log: direct the output of the tests to stdout so that Win98 can 
redirect the output to a file.

Files: wine/include/test.h

--

Tony Lambregts


Index: test.h
===================================================================
RCS file: /home/wine/wine/include/wine/test.h,v
retrieving revision 1.8
diff -u -r1.8 test.h
--- test.h	11 Dec 2002 00:17:42 -0000	1.8
+++ test.h	11 Dec 2002 20:36:53 -0000
@@ -119,7 +119,7 @@
 
 static void exit_process( int code )
 {
-    fflush( stderr );
+    fflush( stdout );
     ExitProcess( code );
 }
 
@@ -156,16 +156,16 @@
     {
         if (condition)
         {
-            fprintf( stderr, "%s:%d: Test succeeded inside todo block",
+            fprintf( stdout, "%s:%d: Test succeeded inside todo block",
                      data->current_file, data->current_line );
             if (msg && msg[0])
             {
                 va_start(valist, msg);
-                fprintf(stderr,": ");
-                vfprintf(stderr, msg, valist);
+                fprintf(stdout,": ");
+                vfprintf(stdout, msg, valist);
                 va_end(valist);
             }
-            fputc( '\n', stderr );
+            fputc( '\n', stdout );
             InterlockedIncrement(&todo_failures);
             return 0;
         }
@@ -175,23 +175,23 @@
     {
         if (!condition)
         {
-            fprintf( stderr, "%s:%d: Test failed",
+            fprintf( stdout, "%s:%d: Test failed",
                      data->current_file, data->current_line );
             if (msg && msg[0])
             {
                 va_start(valist, msg);
-                fprintf( stderr,": ");
-                vfprintf(stderr, msg, valist);
+                fprintf( stdout,": ");
+                vfprintf(stdout, msg, valist);
                 va_end(valist);
             }
-            fputc( '\n', stderr );
+            fputc( '\n', stdout );
             InterlockedIncrement(&failures);
             return 0;
         }
         else
         {
             if (report_success)
-                fprintf( stderr, "%s:%d: Test succeeded\n",
+                fprintf( stdout, "%s:%d: Test succeeded\n",
                          data->current_file, data->current_line);
             InterlockedIncrement(&successes);
         }
@@ -206,9 +206,9 @@
 
     if (winetest_debug > 0)
     {
-        fprintf( stderr, "%s:%d:", data->current_file, data->current_line );
+        fprintf( stdout, "%s:%d:", data->current_file, data->current_line );
         va_start(valist, msg);
-        vfprintf(stderr, msg, valist);
+        vfprintf(stdout, msg, valist);
         va_end(valist);
     }
 }
@@ -272,7 +272,7 @@
 
     if (!(test = find_test( name )))
     {
-        fprintf( stderr, "Fatal: test '%s' does not exist.\n", name );
+        fprintf( stdout, "Fatal: test '%s' does not exist.\n", name );
         exit_process(1);
     }
     successes = failures = todo_successes = todo_failures = 0;
@@ -282,7 +282,7 @@
 
     if (winetest_debug)
     {
-        fprintf( stderr, "%s: %ld tests executed, %ld marked as todo, %ld %s.\n",
+        fprintf( stdout, "%s: %ld tests executed, %ld marked as todo, %ld %s.\n",
                  name, successes + failures + todo_successes + todo_failures,
                  todo_successes, failures + todo_failures,
                  (failures + todo_failures != 1) ? "failures" : "failure" );
@@ -297,9 +297,9 @@
 {
     const struct test *test;
 
-    fprintf( stderr, "Usage: %s test_name\n", argv0 );
-    fprintf( stderr, "\nValid test names:\n" );
-    for (test = winetest_testlist; test->name; test++) fprintf( stderr, "    %s\n", test->name );
+    fprintf( stdout, "Usage: %s test_name\n", argv0 );
+    fprintf( stdout, "\nValid test names:\n" );
+    for (test = winetest_testlist; test->name; test++) fprintf( stdout, "    %s\n", test->name );
     exit_process(1);
 }