Changed automated testing to run test.dart instead of test.py

tools/testing/perf_testing/create_graph.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 math
 try:
   from matplotlib.font_manager import FontProperties
@@ skipping 61 matching lines @@
   if output:
     print output
   return output
 
 def time_cmd(cmd):
   """Determine the amount of (real) time it takes to execute a given command."""
   start = time.time()
   run_cmd(cmd)
   return time.time() - start
 
-def sync_and_build(failed_once=False):
+def sync_and_build():
   """Make sure we have the latest version of of the repo, and build it. We
   begin and end standing in DART_INSTALL_LOCATION.
-  Args:
-    failed_once True if we have attempted to build this once before, and we've
-      failed, indicating the build is broken.
   Returns:
-    err_code = 1 if there was a problem building two times in a row."""
+    err_code = 1 if there was a problem building."""
   os.chdir(DART_INSTALL_LOCATION)
   #Revert our newly built minfrog to prevent conflicts when we update
   run_cmd(['svn', 'revert',  os.path.join(os.getcwd(), 'frog', 'minfrog')])
 
   run_cmd(['gclient', 'sync'])
   # TODO(efortuna): building the sdk locally is a band-aid until all build
   # platform SDKs are hosted in Google storage. Pull from https://sandbox.
   # google.com/storage/?arg=dart-dump-render-tree#dart-dump-render-tree%2Fsdk
   # eventually.
   # TODO(efortuna): Currently always building ia32 architecture because we don't
   # have test statistics for what's passing on x64. Eliminate arch specification
   # when we have tests running on x64, too.
+  shutil.rmtree(os.path.join(os.getcwd(), 
+    utils.GetBuildRoot(utils.GuessOS(), 'release', 'ia32')))
   lines = run_cmd([os.path.join('.', 'tools', 'build.py'), '-m', 'release',
     '--arch=ia32', 'create_sdk'])
   
   for line in lines:
     if 'BUILD FAILED' in lines:
-      if failed_once:
-        # Someone checked in a broken build! Just stop trying to make it work
-        # and wait to try again.
-        print 'Broken Build'
-        return 1
-      #Remove the output directory and attempt to build again. If it still
-      #fails, abort, and try again in a little bit.
-      shutil.rmtree(os.path.join(os.getcwd(), 
-          utils.GetBuildRoot(utils.GuessOS(), 'release', 'ia32')))
-      sync_and_build(True)
+      # Someone checked in a broken build! Just stop trying to make it work
+      # and wait to try again.
+      print 'Broken Build'
+      return 1
   return 0
 
 def ensure_output_directory(dir_name):
   """Test that the listed directory name exists, and if not, create one for
   our output to be placed.
   Args:
     dir_name the directory we will create if it does not exist."""
   dir_path = os.path.join(DART_INSTALL_LOCATION, 'tools', 'testing',
       'perf_testing', dir_name)
   if not os.path.exists(dir_path):
@@ skipping 26 matching lines @@
 
 def get_benchmarks():
   if not PERFBOT_MODE:
     return ['Smoketest']
   else:
     return ['Mandelbrot', 'DeltaBlue', 'Richards', 'NBody', 'BinaryTrees',
     'Fannkuch', 'Meteor', 'BubbleSort', 'Fibonacci', 'Loop', 'Permute',
     'Queens', 'QuickSort', 'Recurse', 'Sieve', 'Sum', 'Tak', 'Takl', 'Towers',
     'TreeSort']
 
+def get_os_directory():
+  """Specifies the name of the directory for the testing build of dart, which
+  has yet a different naming convention from utils.getBuildRoot(...)."""
+  if platform.system() == 'Windows':
+    return 'windows'
+  elif platform.system() == 'Darwin':
+    return 'macos'
+  else:
+    return 'linux'
+
 def upload_to_app_engine():
   """Upload our results to our appengine server."""
   # TODO(efortuna): This is the most basic way to get the data up 
   # for others to view. Revisit this once we're serving nicer graphs (Google
   # Chart Tools) and from multiple perfbots and once we're in a position to
   # organize the data in a useful manner(!!).
   os.chdir(os.path.join(DART_INSTALL_LOCATION, 'tools', 'testing',
       'perf_testing'))
   shutil.rmtree(os.path.join('appengine', 'static', 'graphs'), 
       ignore_errors=True)
@@ skipping 350 matching lines @@
 
       
 class BrowserCorrectnessTestRunner(TestRunner):
   def __init__(self, test_type, result_folder_name):
     super(BrowserCorrectnessTestRunner, self).__init__(result_folder_name,
         get_browsers(), [FROG], [CORRECTNESS])
     self.test_type = test_type
 
   def run_tests(self):
     """run a test of the latest svn revision."""
+    the_os = get_os_directory()

[Siggi Cherem (dart-lang), 2012/01/11 01:32:07]

the_os => arch?

[Emily Fortuna, 2012/01/11 01:38:06]

The directories returned are either "linux" "macos", or "windows", so os seems
more appropriate?

On 2012/01/11 01:32:07, sigmund wrote:

[Siggi Cherem (dart-lang), 2012/01/11 01:39:23]

'the_' looks strange, that's all...

+    suffix = ''
+    if platform.system() == 'Windows':
+      suffix = '.exe'
     for browser in get_browsers():
       current_file = 'correctness%s-%s' % (self.cur_time, browser)
       self.trace_file = os.path.join('tools', 'testing',
           'perf_testing', self.result_folder_name, current_file)
       self.add_svn_revision_to_trace(self.trace_file)
       dart_sdk = os.path.join(os.getcwd(), utils.GetBuildRoot(utils.GuessOS(),
           'release', 'ia32'), 'dart-sdk')
-      run_cmd([os.path.join('.', 'tools', 'test.py'),
-          '--component=webdriver', '--flag=%s' % browser, '--flag=--frog=%s' % \
-          os.path.join(dart_sdk, 'bin', 'frogc'), '--report',
-          '--flag=--froglib=%s' % os.path.join(dart_sdk, 'lib'),
+      run_cmd([os.path.join('.', 'tools', 'testing', 'bin', the_os, 
+          'dart' + suffix), os.path.join('tools', 'test.dart'), 
+          '--component=webdriver', '--flag=%s,--frog=%s,--froglib=%s' % \
+          (browser, os.path.join(dart_sdk, 'bin', 'frogc'), 
+          os.path.join(dart_sdk, 'lib')), '--report',
           '--timeout=20', '--progress=color', '--mode=release', '-j1',
           self.test_type], self.trace_file, append=True)
 
   def process_file(self, afile):
     """Given a trace file, extract all the relevant information out of it to
     determine the number of correctly passing tests.
     
     Arguments:
       afile the filename string"""
     browser = afile.rpartition('-')[2]
@@ skipping 200 matching lines @@
       if has_new_code():
         run_test_sequence(cl, size, language, perf)
       else:
         time.sleep(SLEEP_TIME)
   else:
     run_test_sequence(cl, size, language, perf)
 
 if __name__ == '__main__':
   main()