Changes to testing script so we can run on Windows.

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
   import matplotlib.pyplot as plt
 except ImportError:
   print 'Warning: no matplotlib. ' + \
       'Please ignore if you are running buildbot smoketests.'
 import optparse
 import os
 import platform
 import shutil
 import subprocess
 import time
 import traceback
+import sys
+
+TOOLS_PATH = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(

[Jennifer Messerly, 2011/12/22 19:54:12]

personally I'd do "from os.path import join, dirname, abspath" ... should make
this a bit shorter.

+    os.path.abspath(__file__)))))
+sys.path.append(TOOLS_PATH)
+import utils
 
 """This script runs to track performance and correctness progress of 
 different svn revisions. It tests to see if there a newer version of the code on
 the server, and will sync and run the performance tests if so."""
 
 DART_INSTALL_LOCATION = os.path.join(os.path.dirname(os.path.abspath(__file__)),
     '..', '..', '..')
 V8_MEAN = 'V8 Mean'
 FROG_MEAN = 'frog Mean'
 COMMAND_LINE = 'commandline'
 V8 = 'v8'
 FROG = 'frog'
 V8_AND_FROG = [V8, FROG]
 CORRECTNESS = 'Percent passing'
 COLORS = ['blue', 'green', 'red', 'cyan', 'magenta', 'black']
 GRAPH_OUT_DIR = 'graphs'
 SLEEP_TIME = 200
 PERFBOT_MODE = False
 VERBOSE = False
+HAS_SHELL = False
+if platform.system() == 'Windows':
+  # On Windows, shell must be true to get the correct environment variables.
+  HAS_SHELL = True
 
 """First, some utility methods."""
 
 def RunCmd(cmd_list, outfile=None, append=False):
   """Run the specified command and print out any output to stdout.
   Args:
     cmd_list a list of strings that make up the command to run
     outfile a string indicating the name of the file that we should write stdout
        to 
     append True if we want to append to the file instead of overwriting it"""
   if VERBOSE:
     print ' '.join(cmd_list)
   out = subprocess.PIPE
   if outfile:
     mode = 'w'
     if append:
       mode = 'a'
     out = open(outfile, mode)
-  p = ''
-  if platform.system() == 'Windows':
-    # On Windows, shell must be true to get the correct environment variables.
-    p = subprocess.Popen(cmd_list, stdout = out, stderr = subprocess.PIPE,
-        shell=True)
-  else:
-    p = subprocess.Popen(cmd_list, stdout = out, stderr = subprocess.PIPE)
+  p = subprocess.Popen(cmd_list, stdout = out, stderr = subprocess.PIPE,
+      shell=HAS_SHELL)
   output, not_used = p.communicate();
   if output:
     print output
   return output
 
 def TimeCmd(cmd):
   """Determine the amount of (real) time it takes to execute a given command."""
   start = time.time()
   RunCmd(cmd)
   return time.time() - start
 
 def SyncAndBuild(failed_once=False):
   """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."""
   os.chdir(DART_INSTALL_LOCATION)
   #Revert our newly built minfrog to prevent conflicts when we update
   RunCmd(['svn', 'revert',  os.path.join(os.getcwd(), 'frog', 'minfrog')])
 
   RunCmd(['gclient', 'sync'])
-  #TODO(efortuna): Temporary fix to get IE data without requiring Dart to build
-  # on Windows. Take this out once we have SDKs or can build on Windows.
-  if platform.system() != 'Windows':
-    lines = RunCmd([os.path.join('.', 'tools', 'build.py'), '-m', 'release'])
-    os.chdir('frog')
-    lines += RunCmd([os.path.join('..', 'tools', 'build.py'), '-m', 
-        'debug,release'])
-    os.chdir('..')
+  # 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.
+  lines = RunCmd([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 for the next hour to try again.
-          print 'Broken Build'
-          return 1
-        #Remove the xcode directory and attempt to build again. If it still
-        #fails, abort, and try again next hour.
-        out_dir = 'out'
-        if platform.system() == 'Darwin':
-          out_dir = 'xcodebuild'
-        shutil.rmtree(os.path.join(os.getcwd(), out_dir, 'Release_ia32'))
-        shutil.rmtree(os.path.join(os.getcwd(), 'frog', out_dir, 
-            'Debug_ia32'))
-        shutil.rmtree(os.path.join(os.getcwd(), 'frog', out_dir, 
-            'Release_ia32'))
-        SyncAndBuild(True)
+  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 xcode directory and attempt to build again. If it still

[Jennifer Messerly, 2011/12/22 19:54:12]

should this say "Remove the output directory?"

+      #fails, abort, and try again in a little bit.
+      shutil.rmtree(os.path.join(os.getcwd(), 
+          utils.GetBuildRoot(utils.GuessOS(), 'release', 'ia32')))
+      SyncAndBuild(True)
   return 0
 
 def EnsureOutputDirectory(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 129 matching lines @@
     fontP.set_size('small')
     plt.legend(loc=legend_loc, prop = fontP)
 
     fig = plt.gcf()
     fig.set_size_inches(size_x, size_y)
     fig.savefig(os.path.join(GRAPH_OUT_DIR, filename))
 
   def AddSvnRevisionToTrace(self, outfile):
     """Add the svn version number to the provided tracefile."""
     p = subprocess.Popen(['svn', 'info'], stdout = subprocess.PIPE, 
-      stderr = subprocess.STDOUT)
+      stderr = subprocess.STDOUT, shell = HAS_SHELL)
     output, not_used = p.communicate()
     for line in output.split('\n'):
       if 'Revision' in line:
         RunCmd(['echo', line.strip()], outfile)
 
   def WriteHtml(self, delimiter, rev_nums, label_1, dict_1, label_2, dict_2, 
       cleanFile=False):
     """Adds an html table to the webpage to display the data values. This method
     will be removed when we have a nicer way to display data values."""
     #TODO(efortuna): fix this.
@@ skipping 254 matching lines @@
         GetBrowsers(), [FROG], [CORRECTNESS])
     self.test_type = test_type
 
   def RunTests(self):
     """Run a test of the latest svn revision."""
     for browser in GetBrowsers():
       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.AddSvnRevisionToTrace(self.trace_file)
+      dart_sdk = os.path.join(os.getcwd(), utils.GetBuildRoot(utils.GuessOS(),
+          'release', 'ia32'), 'dart-sdk')
       RunCmd([os.path.join('.', 'tools', 'test.py'),
-          '--component=webdriver', '--flag=%s' % browser, '--report', 
+          '--component=webdriver', '--flag=%s' % browser, '--flag=--frog=%s' % \
+          os.path.join(dart_sdk, 'bin', 'frogc'), 
+          '--flag=--froglib=%s' % os.path.join(dart_sdk, 'lib'),
           '--timeout=20', '--progress=color', '--mode=release', '-j1',
           self.test_type], self.trace_file, append=True)
 
   def ProcessFile(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 197 matching lines @@
       if HasNewCode():
         RunTestSequence(cl, size, language, perf)
       else:
         time.sleep(SLEEP_TIME)
   else:
     RunTestSequence(cl, size, language, perf)
 
 if __name__ == '__main__':
   main()