Improve posting format for size tests.

tools/testing/perf_testing/run_perf_tests.py

 #!/usr/bin/python
 
 # Copyright (c) 2011, 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 optparse
 import os
 from os.path import dirname, abspath
@@ skipping 454 matching lines @@
               'benchmark_page_%s.html' % version)
           self.test.test_runner.run_cmd(
               ['python', os.path.join('tools', 'testing', 'run_selenium.py'),
               '--out', file_path, '--browser', browser,
               '--timeout', '600', '--mode', 'perf'], self.test.trace_file, 
               append=True)
 
   class CommonBrowserFileProcessor(Processor):
     def process_file(self, afile):
       """Comb through the html to find the performance results.
-      Returns: True if we successfullly posted our data to storage."""
+      Returns: True if we successfully posted our data to storage and/or we can
+          delete the trace file."""
       os.chdir(os.path.join(DART_INSTALL_LOCATION, 'tools',
                             'testing', 'perf_testing'))
       if self.test.test_runner.no_upload:
         return
       parts = afile.split('-')
       browser = parts[2]
       version = parts[3]
       f = open(os.path.join(self.test.result_folder_name, afile))
       lines = f.readlines()
       line = ''
       i = 0
       revision_num = 0
       while '<div id="results">' not in line and i < len(lines):
         if 'Revision' in line:
           revision_num = int(line.split()[1].strip('"'))
         line = lines[i]
         i += 1
 
       if i >= len(lines) or revision_num == 0:
         # Then this run did not complete. Ignore this tracefile.
-        return
+        return True
 
       line = lines[i]
       i += 1
       results = []
       if line.find('<br>') > -1:
         results = line.split('<br>')
       else:
         results = line.split('<br />')
       upload_success = True
       for result in results:
@@ skipping 138 matching lines @@
       if browser == 'dartium':
         version = version.replace('frog', 'dart')
       version = version.replace('_','&')
       tags = DromaeoTester.get_valid_dromaeo_tags()
       return '|'.join([ '%s&%s' % (version, tag) for tag in tags])
 
 
   class DromaeoFileProcessor(Processor):
     def process_file(self, afile):
       """Comb through the html to find the performance results.
-      Returns: True if we successfullly posted our data to storage."""
+      Returns: True if we successfully posted our data to storage."""
       if self.test.test_runner.no_upload:
         return
       parts = afile.split('-')
       browser = parts[2]
       version = parts[3]
 
       f = open(os.path.join(self.test.result_folder_name, afile))
       lines = f.readlines()
       i = 0
       revision_num = 0
@@ skipping 101 matching lines @@
                                             total_size[variant])],
             self.test.trace_file, append=True)
 
 
   class DromaeoSizeProcessor(Processor):
     def process_file(self, afile):
       """Pull all the relevant information out of a given tracefile.
 
       Args:
         afile: is the filename string we will be processing.
-      Returns: True if we successfullly posted our data to storage."""
+      Returns: True if we successfully posted our data to storage."""
       os.chdir(os.path.join(DART_INSTALL_LOCATION, 'tools',
           'testing', 'perf_testing'))
       if self.test.test_runner.no_upload:
         return
       f = open(os.path.join(self.test.result_folder_name, afile))
       tabulate_data = False
       revision_num = 0
       revision_pattern = r'Revision: (\d+)'
       result_pattern = r'Size \((\w+), ([a-zA-Z0-9-]+)\): (\d+)'
 
       upload_success = True
       for line in f.readlines():
         rev = re.match(revision_pattern, line.strip())
         if rev:
           revision_num = int(rev.group(1))
           continue
 
         result = re.match(result_pattern, line.strip())
         if result:
           variant = result.group(1)
           metric = result.group(2)
           num = result.group(3)
           if num.find('.') == -1:
             num = int(num)
           else:
             num = float(num)
           upload_success = upload_success and self.report_results(
-              metric, num, 'browser', variant, revision_num, self.CODE_SIZE)
+              metric, num, 'commandline', variant, revision_num, self.CODE_SIZE)
 
       f.close()
       return upload_success
   
 
 class CompileTimeAndSizeTest(Test):
   """Run tests to determine how long frogc takes to compile, and the compiled
   file output size of some benchmarking files."""
   def __init__(self, test_runner):
     """Reference to the test_runner object that notifies us when to begin
@@ skipping 22 matching lines @@
       os.chdir('frog')
       self.test.trace_file = os.path.join(
           '..', 'tools', 'testing', 'perf_testing', 
           self.test.result_folder_name,
           self.test.result_folder_name + self.test.cur_time)
 
       self.add_svn_revision_to_trace(self.test.trace_file)
 
       self.test.test_runner.run_cmd(
           [self.test.dart_vm, 'frogc.dart', '--out=swarm-result',
-          os.path.join('..', 'samples', 'swarm',
-          'swarm.dart')])
+          os.path.join('..', 'internal', 'golem', 'benchmarks-dart2js', 'tests',
+          'samples-r6461', 'swarm', 'swarm.dart')])
 
       swarm_size = 0
       try:
         swarm_size = os.path.getsize('swarm-result')
       except OSError:
         pass #If compilation failed, continue on running other tests.
 
       self.test.test_runner.run_cmd(
           [self.test.dart_vm, 'frogc.dart', '--out=total-result',
-          os.path.join('..', 'samples', 'total',
-          'client', 'Total.dart')])
+          os.path.join('..', 'internal', 'golem', 'benchmarks-dart2js', 'tests',
+          'samples-r6461', 'total', 'client', 'Total.dart')])
       total_size = 0
       try:
         total_size = os.path.getsize('total-result')
       except OSError:
         pass #If compilation failed, continue on running other tests.
 
       self.test.test_runner.run_cmd(
           ['echo', '%d Generated checked swarm size' % swarm_size],
           self.test.trace_file, append=True)
 
       self.test.test_runner.run_cmd(
           ['echo', '%d Generated checked total size' % total_size],
           self.test.trace_file, append=True)
     
       os.chdir('..')
 
 
   class CompileProcessor(Processor):
 
     def process_file(self, afile):
       """Pull all the relevant information out of a given tracefile.
 
       Args:
         afile: is the filename string we will be processing.
-      Returns: True if we successfullly posted our data to storage."""
+      Returns: True if we successfully posted our data to storage."""
       os.chdir(os.path.join(DART_INSTALL_LOCATION, 'tools',
           'testing', 'perf_testing'))
       if self.test.test_runner.no_upload:
         return
       f = open(os.path.join(self.test.result_folder_name, afile))
       tabulate_data = False
       revision_num = 0
       upload_success = True
       for line in f.readlines():
         tokens = line.split()
@@ skipping 38 matching lines @@
     while True:
       if runner.has_new_code():
         runner.run_test_sequence()
       else:
         time.sleep(200)
   else:
     runner.run_test_sequence()
 
 if __name__ == '__main__':
   main()