Enable test invoker to provide path to frog for frogium test.

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 152 matching lines @@
     self.test = test
     self.build_root = utils.GetBuildRoot(OS_GUESS, self.mode, self.arch)
     source = file(test).read()
     self.vm_options = []
     self.dart_options = utils.ParseTestOptions(DART_OPTIONS_PATTERN,
                                                source,
                                                root_path)
     self.is_web_test = _IsWebTest(source)
     self.temp_dir = None
 
+  def GetVMOption(self, option):
+    for flag in self.vm_options:
+      if flag.startswith('--%s=' % option):
+        return flag.split('=')[1]
+    return None
+
   def HasFatalTypeErrors(self):
     """Returns True if this type of component supports --fatal-type-errors."""
     return False
 
   def GetTestFrameworkPath(self):
     """Path to dart source (TestFramework.dart) for testing framework."""
     return os.path.join(self.root_path, 'tests', 'isolate', 'src',
                         'TestFramework.dart')
 
 
@@ skipping 82 matching lines @@
     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 = None
-    flags = self.vm_options
-    for flag in flags:
-      if flag.startswith('--browser='):
-        drt_location = flag.split('=')[1]
-        break
+    drt_location = self.GetVMOption('browser')
     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'
 
     drt_flags = ['--no-timeout']
     dart_flags = '--dart-flags=--enable_asserts --enable_type_checks '
-    dart_flags += ' '.join(flags)
+    dart_flags += ' '.join(self.vm_options)
 
     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 98 matching lines @@
 class FrogChromiumArchitecture(ChromiumArchitecture):
   """ChromiumArchitecture that compiles code using frog."""
 
   def __init__(self, root_path, arch, mode, component, test):
     super(FrogChromiumArchitecture, self).__init__(
         root_path, arch, mode, component, test)
 
   def GetCompileCommand(self, fatal_static_type_errors=False):
     """Returns cmdline as an array to invoke the compiler on this test."""
 
+    # Get a frog executable from the command line.  Default to frogsh.
     # We need an absolute path because the compilation will run
     # in a temporary directory.
-
-    frog = os.path.abspath(utils.GetDartRunner(self.mode, self.arch, 'frogsh'))
-    frog_libdir = os.path.abspath(os.path.join(self.root_path, 'frog', 'lib'))
+    frog = self.GetVMOption('frog')
+    if frog is not None:
+      frog = os.path.abspath(frog)
+    else:
+      frog = os.path.abspath(utils.GetDartRunner(self.mode, self.arch, 'frogsh'))
+    frog_libdir = self.GetVMOption('froglib')
+    if frog_libdir is not None:
+      frog_libdir = os.path.abspath(frog_libdir)
+    else:
+      frog_libdir = os.path.abspath(os.path.join(self.root_path, 'frog', 'lib'))
     cmd = [frog,
         '--libdir=%s' % frog_libdir,
         '--compile-only',
         '--out=%s' % self.GetScriptPath()]
     cmd.extend(self.vm_options)
     cmd.append(self.GetTestScriptFile())
     return cmd
 
 
 class DartiumArchitecture(BrowserArchitecture):
@@ skipping 158 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)