Revert of [test] Refactoring - Let runner handle test IDs.

tools/testrunner/local/execution.py

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 55 matching lines @@
     self.datapath = os.path.join("out", "testrunner_data")
     self.perf_data_manager = perfdata.PerfDataManager(self.datapath)
     self.perfdata = self.perf_data_manager.GetStore(context.arch, context.mode)
     self.perf_failures = False
     self.printed_allocations = False
     self.tests = [ t for s in suites for t in s.tests ]
     if not context.no_sorting:
       for t in self.tests:
         t.duration = self.perfdata.FetchPerfData(t) or 1.0
       self.tests.sort(key=lambda t: t.duration, reverse=True)
-    self._CommonInit(suites, progress_indicator, context)
+    self._CommonInit(len(self.tests), progress_indicator, context)
 
-  def _CommonInit(self, suites, progress_indicator, context):
-    self.total = 0
-    for s in suites:
-      for t in s.tests:
-        t.id = self.total
-        self.total += 1
+  def _CommonInit(self, num_tests, progress_indicator, context):
     self.indicator = progress_indicator
     progress_indicator.runner = self
     self.context = context
     self.succeeded = 0
-    self.remaining = self.total
+    self.total = num_tests
+    self.remaining = num_tests
     self.failed = []
     self.crashed = 0
     self.reran_tests = 0
 
   def _RunPerfSafe(self, fun):
     try:
       fun()
     except Exception, e:
       print("PerfData exception: %s" % e)
       self.perf_failures = True
@@ skipping 30 matching lines @@
       if test.run >= 2 and test.duration > self.context.timeout / 20.0:
         # Rerun slow tests at most once.
         return
 
       # Rerun this test.
       test.duration = None
       test.output = None
       test.run += 1
       pool.add([self._GetJob(test)])
       self.remaining += 1
-      self.total += 1
 
   def _ProcessTestNormal(self, test, result, pool):
     self.indicator.AboutToRun(test)
     test.output = result[1]
     test.duration = result[2]
     has_unexpected_output = test.suite.HasUnexpectedOutput(test)
     if has_unexpected_output:
       self.failed.append(test)
       if test.output.HasCrashed():
         self.crashed += 1
@@ skipping 137 matching lines @@
            test.suite.GetFlagsForTestCase(test, self.context) +
            self.context.extra_flags)
     return cmd
 
 
 class BreakNowException(Exception):
   def __init__(self, value):
     self.value = value
   def __str__(self):
     return repr(self.value)