Change how the editor tests run on the buildbots to use the --test option.

editor/build/build.py

 #!/usr/bin/env 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 glob
 import optparse
 import os
 import re
 import shutil
 import subprocess
 import sys
 import tempfile
 import gsutil
 import ziputils
 import hashlib
 
 from os.path import join
-from xml.dom.minidom import parseString
 
 BUILD_OS = None
 DART_PATH = None
 TOOLS_PATH = None
 
 GSU_PATH_REV = None
 GSU_PATH_LATEST = None
 GSU_API_DOCS_PATH = None
 GSU_API_DOCS_BUCKET = 'gs://dartlang-api-docs'
 
 REVISION = None
 TRUNK_BUILD = None
 MILESTONE_BUILD = None
 PLUGINS_BUILD = None
 
+NO_UPLOAD = None
+
 utils = None
 
 class AntWrapper(object):
   """A wrapper for ant build invocations"""
 
   _antpath = None
   _bzippath = None
   _propertyfile = None
 
   def __init__(self, propertyfile, antpath='/usr/bin', bzippath=None):
@@ skipping 149 matching lines @@
   global BUILD_OS
   global DART_PATH
   global TOOLS_PATH
   global GSU_PATH_REV
   global GSU_API_DOCS_PATH
   global GSU_PATH_LATEST
   global REVISION
   global TRUNK_BUILD
   global MILESTONE_BUILD
   global PLUGINS_BUILD
+  global NO_UPLOAD
   global utils
 
   if not sys.argv:
     print 'Script pathname not known, giving up.'
     return 1
 
   scriptdir = os.path.abspath(os.path.dirname(sys.argv[0]))
   editorpath = os.path.abspath(os.path.join(scriptdir, '..'))
   thirdpartypath = os.path.abspath(os.path.join(scriptdir, '..', '..',
                                                 'third_party'))
   toolspath = os.path.abspath(os.path.join(scriptdir, '..', '..',
                                            'tools'))
   dartpath = os.path.abspath(os.path.join(scriptdir, '..', '..'))
   antpath = os.path.join(thirdpartypath, 'apache_ant', '1.8.4')
   bzip2libpath = os.path.join(thirdpartypath, 'bzip2')
   buildpath = os.path.join(editorpath, 'tools', 'features',
                            'com.google.dart.tools.deploy.feature_releng')
   utils = GetUtils(toolspath)
   buildos = utils.GuessOS()
 
   BUILD_OS = utils.GuessOS()
   DART_PATH = dartpath
   TOOLS_PATH = toolspath
 
+  if (os.environ.get('DART_NO_UPLOAD') is not None):
+    NO_UPLOAD = True
+
   # TODO(devoncarew): remove this hardcoded e:\ path
   buildroot_parent = {'linux': dartpath, 'macos': dartpath, 'win32': r'e:\tmp'}
   buildroot = os.path.join(buildroot_parent[buildos], 'build_root')
 
   os.chdir(buildpath)
   ant_property_file = None
   sdk_zip = None
 
   try:
     ant_property_file = tempfile.NamedTemporaryFile(suffix='.property',
@@ skipping 160 matching lines @@
     #This is an override for local testing
     force_run_install = os.environ.get('FORCE_RUN_INSTALL')
 
     if force_run_install or (not PLUGINS_BUILD):
       InstallSdk(buildroot, buildout, buildos, buildout)
       InstallDartium(buildroot, buildout, buildos, gsu)
 
     if status:
       return status
 
-    junit_status = 0
-
     if not build_skip_tests:
-      StartBuildStep('run_tests')
-
-      junit_status = ant.RunAnt('../com.google.dart.tools.tests.feature_releng',
-                              'buildTests.xml',
-                              revision, builder_name, buildroot, buildout,
-                              editorpath, buildos,
-                              extra_artifacts=extra_artifacts)
-
-      #<testsuite errors="0" failures="1" name="com.google.dart.tools.core_test"
-      #   tests="740" time="40.713">
-      testResults = parseString(open(join(buildout, 'test-results.xml')).read())
-      testSuite = testResults.documentElement
-
-      if testSuite.getAttribute("errors") != "0":
-        junit_status = 1
-      if testSuite.getAttribute("failures") != "0":
-        junit_status = 1
-
-      if junit_status:
-        BuildStepFailure()
-
-      StartBuildStep('test_summary')
-      PrintTestSummary(testSuite)
-
-      if junit_status:
-        BuildStepFailure()
-        PrettyPrintTestFailures(testSuite)
-
-      properties = ReadPropertyFile(buildos, ant_property_file.name)
-      if junit_status:
-        if properties['build.runtime']:
-          #if there is a build.runtime and the status is not
-          #zero see if there are any *.log entries
-          PrintErrorLog(properties['build.runtime'])
+      RunEditorTests(buildout, buildos)
 
     if buildos:
       StartBuildStep('upload_artifacts')
 
       _InstallArtifacts(buildout, buildos, extra_artifacts)
 
       # dart-editor-linux.gtk.x86.zip --> darteditor-linux-32.zip
       RenameRcpZipFiles(buildout)
 
       PostProcessEditorBuilds(buildout)
@@ skipping 332 matching lines @@
 
   checksum = CalculateChecksum(filename)
   checksum_filename = '%s.md5sum' % filename
 
   with open(checksum_filename, 'w') as f:
     f.write('%s *%s' % (checksum, os.path.basename(filename)))
 
   return checksum_filename
 
 
+def RunEditorTests(buildout, buildos):
+  StartBuildStep('run_tests')
+
+  for editorArchive in _FindRcpZipFiles(buildout):
+    if (editorArchive.endswith('_64.zip')):
+      print 'Running tests for %s...' % editorArchive
+      tempDir = join(buildout, 'tests_temp')
+      
+      zipper = ziputils.ZipUtil(join(buildout, editorArchive), buildos)
+      shutil.rmtree(tempDir, True)  
+      os.mkdir(tempDir)
+      zipper.UnZip(tempDir)
+
+      editorExecutable = GetEditorExecutable(join(tempDir, 'dart'))
+      args = [editorExecutable, '-consoleLog', '--test', '--auto-exit',
+              '-data', join(tempDir, 'workspace')]
+      if sys.platform == 'linux':
+        args = ['xvfb-run', '-a'] + args
+      if (subprocess.call(args)):
+        BuildStepFailure()
+
+      shutil.rmtree(tempDir, True)
+
+
+def GetEditorExecutable(editorDir):
+  if sys.platform == 'darwin':
+    executable = join('DartEditor.app', 'Contents', 'MacOS', 'DartEditor')
+  elif sys.platform == 'win32':
+    executable = 'DartEditor.exe'
+  else:
+    executable = 'DartEditor'
+  return join(editorDir, executable)
+
+
 def ReplaceInFiles(paths, subs):
   '''Reads a series of files, applies a series of substitutions to each, and
      saves them back out. subs should by a list of (pattern, replace) tuples.'''
   for path in paths:
     contents = open(path).read()
     for pattern, replace in subs:
       contents = re.sub(pattern, replace, contents)
     dest = open(path, 'w')
     dest.write(contents)
     dest.close()
@@ skipping 181 matching lines @@
   """tar gzip the given directory into the file"""
   EnsureDirectoryExists(targetFile)
   FileDelete(targetFile)
   ExecuteCommand(['tar', 'czf', targetFile, os.path.basename(directory)],
                  os.path.dirname(directory))
 
 
 def UploadFile(targetFile, createChecksum=True):
   """Upload the given file to google storage."""
 
+  if (NO_UPLOAD):
+    return
+    
   filePathRev = "%s/%s" % (GSU_PATH_REV, os.path.basename(targetFile))
   filePathLatest = "%s/%s" % (GSU_PATH_LATEST, os.path.basename(targetFile))
 
   if (createChecksum):
     checksum = CreateChecksumFile(targetFile)
 
     checksumRev = "%s/%s" % (GSU_PATH_REV, os.path.basename(checksum))
     checksumLatest = "%s/%s" % (GSU_PATH_LATEST, os.path.basename(checksum))
 
   Gsutil(['cp', '-a', 'public-read', r'file://' + targetFile, filePathRev])
@@ skipping 48 matching lines @@
 
 def StartBuildStep(name):
   print "@@@BUILD_STEP %s@@@" % name
   sys.stdout.flush()
 
 
 def BuildStepFailure():
   print '@@@STEP_FAILURE@@@'
   sys.stdout.flush()
 
-def PrintTestSummary(testSuite):
-  print "\n%s:\n  %s tests, %s errors, %s failures (time: %s)\n" % (
-      testSuite.getAttribute("name"),
-      testSuite.getAttribute("tests"),
-      testSuite.getAttribute("errors"),
-      testSuite.getAttribute("failures"),
-      testSuite.getAttribute("time"))
-  sys.stdout.flush()
-
-
-def PrettyPrintTestFailures(testSuite):
-  # for all testcase children
-  #   if they contain a failure or error child node
-  #     print out the name and node text
-  for testCase in testSuite.getElementsByTagName('testcase'):
-    for failureNode in testCase.getElementsByTagName('failure'):
-      print 'test failed: %s' % testCase.getAttribute('name')
-      print failureNode.childNodes[0].data
-    for errorNode in testCase.getElementsByTagName('error'):
-      print 'test error: %s' % testCase.getAttribute('name')
-      print errorNode.childNodes[0].data
-  sys.stdout.flush()
-
 
 def FileDelete(f):
   """delete the given file - do not re-throw any exceptions that occur"""
   if os.path.exists(f):
     try:
       os.remove(f)
     except OSError:
       print 'error deleting %s' % f
 
 
 if __name__ == '__main__':
   sys.exit(main())