Enable test script to specify different DRT binary

tools/testing/architecture.py

 # 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 os
 import platform
 import re
 import shutil
 import subprocess
@@ skipping 252 matching lines @@
       f.close()
 
     app_output_file = self.GetTestScriptFile()
     f = open(app_output_file, 'w')
     f.write(self.GetTestContents(library_file))
     f.close()
 
   def GetRunCommand(self, fatal_static_type_errors=False):
     """Returns a command line to execute for the test."""
     fatal_static_type_errors = fatal_static_type_errors  # shutup lint!
+    # Find DRT
     # For some reason, DRT needs to be called via an absolute path
-    drt_location = os.path.join(self.root_path, 'client', 'tests', 'drt',
-                                'DumpRenderTree')
+    drt_location = None
+    flags = self.vm_options
+    for flag in flags:
+      if flag.startswith('--browser='):
+        drt_location = flag.split('=')[1]
+        break
+    if drt_location is not None:
+      drt_location = os.path.abspath(drt_location)
+    else:
+      drt_location = os.path.join(self.root_path, 'client', 'tests', 'drt',
+                                  'DumpRenderTree')
 
-    # On Mac DumpRenderTree is a .app folder
-    if platform.system() == 'Darwin':
-      drt_location += '.app/Contents/MacOS/DumpRenderTree'
+      # On Mac DumpRenderTree is a .app folder
+      if platform.system() == 'Darwin':
+        drt_location += '.app/Contents/MacOS/DumpRenderTree'
 
     drt_flags = ['--no-timeout']
     dart_flags = '--dart-flags=--enable_asserts --enable_type_checks '
-    dart_flags += ' '.join(self.vm_options)
+    dart_flags += ' '.join(flags)

[Emily Fortuna, 2011/12/06 19:08:19]

Out of curiosity, why rename vm_options to the local variable flags? It doesn't
look like either are being modified and "flags" is only used twice.

 
     drt_flags.append(dart_flags)
 
     html_output_file = os.path.join(self.GetHtmlPath(), self.GetHtmlName())
     f = open(html_output_file, 'w')
     f.write(self.GetHtmlContents())
     f.close()
 
     drt_flags.append(html_output_file)
 
@@ skipping 281 matching lines @@
     return WebDriverArchitecture(root_path, arch, mode, component, test)
 
   elif component in ['vm', 'frog', 'frogsh']:
     return StandaloneArchitecture(root_path, arch, mode, component, test)
 
   elif component == 'leg':
     return LegArchitecture(root_path, arch, mode, component, test)
 
   elif component == 'dartc':
     return DartcArchitecture(root_path, arch, mode, component, test)