Bleeding edge change to get frog integrated into the testing infrastructure.

dart/tools/test.py

Index: dart/tools/test.py
===================================================================
--- dart/tools/test.py	(revision 1135)
+++ dart/tools/test.py	(working copy)
@@ -611,27 +611,23 @@
     result = utils.GetBuildConf(mode, arch)
     return result
 
-  def GetExecutable(self, mode, arch, name):
+  def GetExecutable(self, mode, arch, path):
     """Returns the name of the executable used to run the test."""
     if self.executable is not None:
       return self.executable
-    path = os.path.abspath(os.path.join(self.GetBuildRoot(mode, arch), name))
     if utils.IsWindows() and not path.endswith('.exe'):
       return path + '.exe'
     else:
       return path
 
+  def GetD8(self, mode, arch):
+    d8 = os.path.join(self.GetBuildRoot(mode, arch), 'd8')
+    return self.GetExecutable(mode, arch, d8)
+
   def GetDart(self, mode, arch, component):
-    """Returns the path to the Dart test runner (executes the .dart file)."""
-    if component == 'dartc':
-      command = [os.path.abspath(
-          os.path.join(self.GetBuildRoot(mode, arch),
-                       'compiler', 'bin', 'dartc_test'))]
-    else:
-      command = [self.GetExecutable(mode, arch, 'dart_bin')]
+    dart = utils.GetDartRunner(mode, arch, component)
+    return [self.GetExecutable(mode, arch, dart)]
 
-    return command
-
   def GetDartC(self, mode, arch):
     """Returns the path to the Dart --> JS compiler."""
     dartc = os.path.abspath(os.path.join(
@@ -644,7 +640,8 @@
     return command
 
   def GetRunTests(self, mode, arch):
-    return [self.GetExecutable(mode, arch, 'run_vm_tests')]
+    path = os.path.join(self.GetBuildRoot(mode, arch), 'run_vm_tests')
+    return [self.GetExecutable(mode, arch, path)]
 
 
 def RunTestCases(cases_to_run, progress, tasks, context):
@@ -1220,7 +1217,7 @@
   result.add_option(
       '-c', '--component',
       help='The component to test against '
-           '(most, vm, dartc, chromium, dartium)',
+           '(most, vm, dartc, frog, frogsh, chromium, dartium)',
       metavar='[most,vm,dartc,chromium,dartium]',
       default='vm')
   return result
@@ -1235,13 +1232,6 @@
   if options.component == 'most':
     options.component = 'vm,dartc'
 
-  if 'dartc' in options.arch:
-    options.component = 'dartc'
-  if 'dartium' in options.arch:
-    options.component = 'dartium'
-  if 'chromium' in options.arch:
-    options.component = 'chromium'
-
   # By default we run with a higher timeout setting in when running on
   # a simulated architecture and in debug mode.
   if not options.timeout:
@@ -1266,7 +1256,8 @@
       print 'Unknown arch %s' % arch
       return False
   for component in options.component:
-    if not component in ['vm', 'dartc', 'chromium', 'dartium']:
+    if not component in ['vm', 'dartc', 'frog', 'frogsh',
+                         'chromium', 'dartium']:
       print 'Unknown component %s' % component
       return False
   options.flags = []