#
#
# patch "testlib.lua"
#  from [8b1a5d8ff4da71d575ff70fcc3aaba5d2d25ca23]
#    to [8e6c3c361b1589b2c152eb0a7874f0271a6758e5]
# 
# patch "win32/tester-plaf.cc"
#  from [4cae66ca767106b916ed327199590446f1cc0cc7]
#    to [b7a03cf159f5228fb467db08349691d57db6c310]
#
============================================================
--- testlib.lua	8b1a5d8ff4da71d575ff70fcc3aaba5d2d25ca23
+++ testlib.lua	8e6c3c361b1589b2c152eb0a7874f0271a6758e5
@@ -1029,9 +1029,18 @@ function run_tests(debugging, list_only,
      end
 
      counts.total = counts.total + 1
-     local times = string.format("%d:%02d, %d:%02d on CPU",
-                                 wall_seconds / 60, wall_seconds % 60,
-                                 cpu_seconds / 60, cpu_seconds % 60);
+     local format_seconds = function (seconds)
+                               return string.format("%d:%02d",
+                                                    seconds / 60,
+                                                    seconds % 60)
+                            end
+     local times = ""
+     if wall_seconds > -1 then
+        times = format_seconds(wall_seconds)
+        if cpu_seconds > -1 then
+           times = times . ", " . format_seconds(cpu_seconds) . " on CPU"
+        end
+     end
      P(string.format("%s %s %s\n", test_header, what, times))
      return (can_delete and not debugging)
   end
============================================================
--- win32/tester-plaf.cc	4cae66ca767106b916ed327199590446f1cc0cc7
+++ win32/tester-plaf.cc	b7a03cf159f5228fb467db08349691d57db6c310
@@ -194,13 +194,14 @@ void run_tests_in_children(test_enumerat
         }
       catch (...)
         {
-          cleanup(t, 121);
+          cleanup(t, 121, 0, 0);
           continue;
         }
 
       change_current_working_dir(testdir);
       argv[4] = t.name.c_str();
       pid_t child = process_spawn(argv);
+      DWORD start_millis = GetTickCount();
       change_current_working_dir(run_dir);
 
       int status;
@@ -209,7 +210,8 @@ void run_tests_in_children(test_enumerat
       else
         process_wait(child, &status);
 
-      if (cleanup(t, status))
+      DWORD end_millis = GetTickCount();
+      if (cleanup(t, status, (end_millis - start_millis) / 1000, -1))
         do_remove_recursive(testdir);
     }
 }