Fix step and build time output.

tools/bisect-perf-regression.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Performance Test Bisect Tool
 
 This script bisects a series of changelists using binary search. It starts at
 a bad revision where a performance metric has regressed, and asks for a last
 known-good revision. It will then binary search across this revision range by
@@ skipping 1605 matching lines @@
           after_build_time = time.time()
           results = self.RunPerformanceTestAndParseResults(command_to_run,
                                                            metric)
 
           if results[1] == 0:
             external_revisions = self.Get3rdPartyRevisionsFromCurrentRevision(
                 depot, revision)
 
             if not external_revisions is None:
               return (results[0], results[1], external_revisions,
-                  time.time() - after_build_time, time.time() -
+                  time.time() - after_build_time, after_build_time -
                   start_build_time)
             else:
               return ('Failed to parse DEPS file for external revisions.',
                   BUILD_RESULT_FAIL)
           else:
             return results
         else:
           return ('Failed to build revision: [%s]' % (str(revision, )),
               BUILD_RESULT_FAIL)
       else:
@@ skipping 735 matching lines @@
       print '  %8s  %s..%s %s' % (
           current_data['depot'], current_id, previous_id,
           ('%d%%' % confidence).center(10, ' '))
       print
 
   def _PrintStepTime(self, revision_data_sorted):
     step_perf_time_avg = 0.0
     step_build_time_avg = 0.0
     step_count = 0.0
     for _, current_data in revision_data_sorted:
-      step_perf_time_avg += current_data['perf_time']
-      step_build_time_avg += current_data['build_time']
-      step_count += 1
+      if current_data['value']:
+        step_perf_time_avg += current_data['perf_time']
+        step_build_time_avg += current_data['build_time']
+        step_count += 1
     if step_count:
       step_perf_time_avg = step_perf_time_avg / step_count
       step_build_time_avg = step_build_time_avg / step_count
     print
     print 'Average build time : %s' % datetime.timedelta(
         seconds=int(step_build_time_avg))
     print 'Average test time  : %s' % datetime.timedelta(
         seconds=int(step_perf_time_avg))
 
   def _PrintWarnings(self):
@@ skipping 599 matching lines @@
       # The perf dashboard scrapes the "results" step in order to comment on
       # bugs. If you change this, please update the perf dashboard as well.
       bisect_utils.OutputAnnotationStepStart('Results')
     print 'Error: %s' % e.message
     if opts.output_buildbot_annotations:
       bisect_utils.OutputAnnotationStepClosed()
   return 1
 
 if __name__ == '__main__':
   sys.exit(main())