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

dart/tools/utils.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.
 
 # This file contains a set of utilities functions used by other Python-based
 # scripts.
 
 import commands
 import os
 import platform
@@ skipping 89 matching lines @@
 
    for arg in parser.rargs:
      if arg[:2].startswith('--') or arg[0] != '-':
        break
      value.append(arg)
 
    del parser.rargs[:len(value)]
    setattr(parser.values, option.dest, value)
 
 
+# Returns the path to the Dart test runner (executes the .dart file).
+def GetDart(mode, arch, component):

[ahe, 2011/11/03 11:18:38]

Please use proper python doc strings.

Also, consider if this method should be renamed to GetDartRunner or
GetDartRuntime.

[ngeoffray, 2011/11/03 11:53:00]

I followed the style in this script.
Renamed to GetDartRunner.

+  build_root = GetBuildRoot(GuessOS(), mode, arch)
+  if component == 'dartc':
+    return os.path.join(build_root, 'compiler', 'bin', 'dartc_test')
+  elif component == 'frog':
+    return os.path.join(build_root, 'frog', 'bin', 'frog')
+  elif component == 'frogsh':
+    return os.path.join(build_root, 'frog', 'bin', 'frogsh')
+  else:
+    return os.path.join(build_root, 'dart_bin')
+
+
 # Mapping table between build mode and build configuration.
 BUILD_MODES = {
   'debug': 'Debug',
   'release': 'Release',
 }
 
 
 # Mapping table between OS and build output location.
 BUILD_ROOT = {
   'win32': os.path.join(''),
   'linux': os.path.join('out'),
   'freebsd': os.path.join('out'),
   'macos': os.path.join('xcodebuild'),
 }
 
 def GetBuildMode(mode):
   global BUILD_MODES
   return BUILD_MODES[mode]
 
 
 def GetBuildConf(mode, arch):
   return GetBuildMode(mode) + "_" + arch
 
 ARCH_GUESS = GuessArchitecture()
 BASE_DIR = os.path.abspath(os.path.join(os.curdir, '..'))
 
 def GetBuildRoot(target_os, mode=None, arch=None):
   global BUILD_ROOT
   if mode:
-    # TODO(ngeoffray): Remove this test once the testing infrastructure does not
-    # treat 'dartc' as an arch.
-    if arch == 'dartc': arch = ARCH_GUESS
     return os.path.join(BUILD_ROOT[target_os], GetBuildConf(mode, arch))
   else:
     return BUILD_ROOT[target_os]
 
 def GetBaseDir():
   return BASE_DIR
 
 def RewritePathSeparator(path, workspace):
   # Paths in test files are always specified using '/'
   # as the path separator. Replace with the actual
@@ skipping 93 matching lines @@
   def __init__(self, value):
     self.value = value
 
   def __str__(self):
     return repr(self.value)
 
 
 if __name__ == "__main__":
   import sys
   Main(sys.argv)