commit feaad968b800ebb2333623736f112e0779fe8b99
author Ferenc Wagner <wferi@afavant.elte.hu> Sat Feb 21 04:01:56 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Feb 21 04:01:56 2004 +0000
tree a91b2a82e9763348695246b7ea581eed5de6da98
parent 69880eb587d7cc876c634d8d80718b8043644e87

Report the error sent by the CGI script.
Make progress bar selection explicit.

programs/winetest/main.c

diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index 4e74e24..f92cf49 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -311,7 +311,7 @@
     wine_tests = xmalloc (nr_of_files * sizeof wine_tests[0]);
 
     report (R_STATUS, "Extracting tests");
-    report (R_PROGRESS, nr_of_files);
+    report (R_PROGRESS, 0, nr_of_files);
     for (i = 0; i < nr_of_files; i++) {
         get_subtests (tempdir, wine_tests+i, i+1);
         nr_of_tests += wine_tests[i].subtest_count;
@@ -319,7 +319,7 @@
     report (R_DELTA, 0, "Extracting: Done");
 
     report (R_STATUS, "Running tests");
-    report (R_PROGRESS, nr_of_tests);
+    report (R_PROGRESS, 1, nr_of_tests);
     for (i = 0; i < nr_of_files; i++) {
         struct wine_test *test = wine_tests + i;
         int j;
@@ -385,8 +385,7 @@
                 submit = strtok (NULL, " ");
                 if (tag)
                     report (R_WARNING, "ignoring tag for submit");
-                if (send_file (submit))
-                    report (R_ERROR, "can't submit file %s", submit);
+                send_file (submit);
                 break;
             case 'o':
                 logname = strtok (NULL, " ");
@@ -411,12 +410,10 @@
     if (!logname && !submit) {
         report (R_STATUS, "Starting up");
         logname = run_tests (NULL, tag);
-        if (report (R_ASK, MB_YESNO,
-                    "Do you want to submit the test results?") == IDYES)
-            if (send_file (logname))
-                report (R_FATAL, "Can't submit logfile '%s'", logname);
-        if (remove (logname))
-            report (R_WARNING, "Can't remove logfile: %d.", errno);
+        if (report (R_ASK, MB_YESNO, "Do you want to submit the "
+                    "test results?") == IDYES)
+            if (!send_file (logname) && remove (logname))
+                report (R_WARNING, "Can't remove logfile: %d.", errno);
         free (logname);
         report (R_STATUS, "Finished");
     }