Fix for running the tests on the dart-editor-win bot.

editor/build/build.py

Index: editor/build/build.py
===================================================================
--- editor/build/build.py	(revision 25092)
+++ editor/build/build.py	(working copy)
@@ -766,23 +766,36 @@
 def RunEditorTests(buildout, buildos):
   StartBuildStep('run_tests')
 
-  for editorArchive in _FindRcpZipFiles(buildout):
-    if (editorArchive.endswith('_64.zip')):
-      with utils.TempDir('editor_') as tempDir:
-        print 'Running tests for %s...' % editorArchive
+  for editorArchive in _GetTestableRcpArchives(buildout):
+    with utils.TempDir('editor_') as tempDir:
+      print 'Running tests for %s...' % editorArchive
 
-        zipper = ziputils.ZipUtil(join(buildout, editorArchive), buildos)
-        zipper.UnZip(tempDir)
+      zipper = ziputils.ZipUtil(join(buildout, editorArchive), buildos)
+      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, shell=IsWindows())):
-          BuildStepFailure()
+      editorExecutable = GetEditorExecutable(join(tempDir, 'dart'))
+      args = [editorExecutable, '--test', '--auto-exit',
+              '-data', join(tempDir, 'workspace')]
+      if sys.platform == 'linux':
+        args = ['xvfb-run', '-a'] + args
+      # this can hang if a 32 bit jvm is not available on windows...
+      if (subprocess.call(args, shell=IsWindows())):

[kustermann, 2013/07/17 13:47:06]

No need for outermost '(', ')'.

[devoncarew, 2013/07/17 16:29:49]

Done.

+        BuildStepFailure()
 
 
+# Return x86_64.zip (64 bit) on mac and linux; x86.zip (32 bit) on windows
+def _GetTestableRcpArchives(buildout):
+  result = []
+  
+  for archive in _FindRcpZipFiles(buildout):
+    if IsWindows() and archive.endswith('x86.zip'):
+      result.append(archive)
+    elif not IsWindows() and archive.endswith('x86_64.zip'):
+      result.append(archive)
+  
+  return result
+
+
 def GetEditorExecutable(editorDir):
   if sys.platform == 'darwin':
     executable = join('DartEditor.app', 'Contents', 'MacOS', 'DartEditor')