build.py will not accept --arch=dartc soon, so removing references and uses of --arch=dartc in th...

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 112 matching lines @@
 }
 
 def GetBuildMode(mode):
   global BUILD_MODES
   return BUILD_MODES[mode]
 
 
 def GetBuildConf(mode, arch):
   return GetBuildMode(mode) + "_" + arch
 
-# Temporary variables that we should remove once the buildbots build 'ia32'
-# instead of 'dartc'.
-RUN_FROM_TOP_DIR = os.path.basename(os.path.abspath(os.curdir)) == 'dart'
 ARCH_GUESS = GuessArchitecture()
 BASE_DIR = os.path.abspath(os.path.join(os.curdir, '..'))
-if RUN_FROM_TOP_DIR:
-  BASE_DIR = os.path.abspath(os.curdir)
 
 def GetBuildRoot(target_os, mode=None, arch=None):
-  if arch == 'dartc' and RUN_FROM_TOP_DIR: arch = ARCH_GUESS
   global BUILD_ROOT
   if mode:
-    return os.path.join(BUILD_ROOT[target_os], GetBuildConf(mode, arch))
+    path = os.path.join(BUILD_ROOT[target_os], GetBuildConf(mode, arch))
+    # TODO(ngeoffray): Remove this test once the testing infrastructure does not
+    # treat 'dartc' as an arch.
+    if not os.path.exists(path) and arch == 'dartc':
+      path = os.path.join(BUILD_ROOT[target_os], GetBuildConf(mode, ARCH_GUESS))
+    return path;
   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
   # path separator before use.
@@ skipping 92 matching lines @@
   def __init__(self, value):
     self.value = value
 
   def __str__(self):
     return repr(self.value)
 
 
 if __name__ == "__main__":
   import sys
   Main(sys.argv)