Reapply revision 11570, custom callbacks are now implemented in dartium.

tools/testing/perf_testing/run_perf_tests.py

 #!/usr/bin/python
 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import datetime
 import math             
 import optparse
 import os
@@ skipping 80 matching lines @@
     if os.path.exists(DART_REPO_LOC):
       os.chdir(DART_REPO_LOC)
       results, _ = self.RunCmd(['svn', 'st'])
       for line in results.split('\n'):
         if line.startswith('?'):
           to_remove = line.split()[1]
           if os.path.isdir(to_remove):
             shutil.rmtree(to_remove)#, ignore_errors=True)
           else:
             os.remove(to_remove)
+        elif any(line.startswith(status) for status in ['A', 'M', 'C', 'D']):
+          self.RunCmd(['svn', 'revert', line.split()[1]])
 
   def GetArchive(self, archive_name):
     """Wrapper around the pulling down a specific archive from Google Storage.
     Adds a specific revision argument as needed.
     Returns: The stdout and stderr from running this command."""
     while True:
       cmd = ['python', os.path.join(DART_REPO_LOC, 'tools', 'get_archive.py'),
              archive_name]
       if int(self.current_revision_num) != -1:
         cmd += ['-r', str(self.current_revision_num)]
@@ skipping 131 matching lines @@
       def IsSafeFile(f):
         if not any(f.startswith(prefix) for prefix in definitely_yes):
           return any(f.startswith(prefix) for prefix in no_effect)
         return False
       return not all(IsSafeFile(f) for f in files_list)
 
     if revision_num:
       return (HasPerfAffectingResults(GetFileList(
           revision_num)), revision_num)
     else:
-      results, _ = self.RunCmd(['svn', 'st', '-u'], std_in='p\r\n')
-      latest_interesting_server_rev = int(results.split('\n')[-2].split()[-1])
+      latest_interesting_server_rev = None
+      while not latest_interesting_server_rev:
+        results, _ = self.RunCmd(['svn', 'st', '-u'], std_in='p\r\n')
+        if len(results.split('\n')) >= 2:
+          latest_interesting_server_rev = int(
+              results.split('\n')[-2].split()[-1])
+          print 'success'
+        else:
+          print 'hrmmmm'
       if self.backfill:
         done_cls = list(UpdateSetOfDoneCls())
         done_cls.sort()
         if done_cls:
           last_done_cl = int(done_cls[-1])
         else:
           last_done_cl = EARLIEST_REVISION
         while latest_interesting_server_rev >= last_done_cl:
           file_list = GetFileList(latest_interesting_server_rev)
           if HasPerfAffectingResults(file_list):
@@ skipping 142 matching lines @@
         for extra_metric in extra_metrics:              
           self.revision_dict[platform][f][extra_metric] = []            
           self.values_dict[platform][f][extra_metric] = []
 
   def IsValidCombination(self, platform, variant):
     """Check whether data should be captured for this platform/variant
     combination.
     """
     # TODO(vsm): This avoids a bug in 32-bit Chrome (dartium)
     # running JS dromaeo.
+    if variant == 'js':
+      return False
     if platform == 'dartium' and variant == 'js':
       return False
     if (platform == 'safari' and variant == 'dart2js' and
         int(self.test_runner.current_revision_num) < 10193):
       # In revision 10193 we fixed a bug that allows Safari 6 to run dart2js
       # code. Since we can't change the Safari version on the machine, we're
       # just not running
       # for this case.
       return False
     return True
@@ skipping 221 matching lines @@
               '--out', file_path, '--browser', browser,
               '--timeout', '600', '--mode', 'perf'], self.test.trace_file, 
               append=True)
 
   class CommonBrowserFileProcessor(Processor):
 
     def ProcessFile(self, afile, should_post_file):
       """Comb through the html to find the performance results.
       Returns: True if we successfully posted our data to storage and/or we can
           delete the trace file."""
+      print afile
       os.chdir(os.path.join(TOP_LEVEL_DIR, 'tools',
                             'testing', 'perf_testing'))
       parts = afile.split('-')
       browser = parts[2]
       version = parts[3]
       f = self.OpenTraceFile(afile, should_post_file)
       lines = f.readlines()
       line = ''
       i = 0
       revision_num = 0
@@ skipping 237 matching lines @@
         version = version.replace('frog', 'dart')
       version = version.replace('_','AND')
       tags = DromaeoTester.GetValidDromaeoTags()
       return 'OR'.join([ '%sAND%s' % (version, tag) for tag in tags])
 
 
   class DromaeoFileProcessor(Processor):
     def ProcessFile(self, afile, should_post_file):
       """Comb through the html to find the performance results.
       Returns: True if we successfully posted our data to storage."""
+      print afile
       parts = afile.split('-')
       browser = parts[2]
       version = parts[3]
 
       bench_dict = self.test.values_dict[browser][version]
 
       f = self.OpenTraceFile(afile, should_post_file)
       lines = f.readlines()
       i = 0
       revision_num = 0
       revision_pattern = r'Revision: (\d+)'
       suite_pattern = r'<div class="result-item done">(.+?)</ol></div>'
       result_pattern = r'<b>(.+?)</b>(.+?)<small> runs/s(.+)'
 
       upload_success = True
       for line in lines:
-        rev = re.match(revision_pattern, line.strip())
+        rev = re.match(revision_pattern, line.strip().replace('"', ''))
         if rev:
           revision_num = int(rev.group(1))
           continue
 
         suite_results = re.findall(suite_pattern, line)
         if suite_results:
           for suite_result in suite_results:
             results = re.findall(r'<li>(.*?)</li>', suite_result)
             if results:
               for result in results:
@@ skipping 176 matching lines @@
       else:
         if runner.backfill:
           results_set = FillInBackHistory(results_set, runner)
         else:
           time.sleep(200)
   else:
     runner.RunTestSequence()
 
 if __name__ == '__main__':
   main()