Fix bad code in test_suite.dart

tools/testing/dart/test_suite.dart

 // Copyright (c) 2012, 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.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 113 matching lines @@
  * and a status file containing the expected results when these tests are run.
  */
 abstract class TestSuite {
   final Map configuration;
   final String suiteName;
   // This function is set by subclasses before enqueueing starts.
   Function doTest;
   Map<String, String> _environmentOverrides;
 
   TestSuite(this.configuration, this.suiteName) {
-    _environmentOverrides = {
+    if (configuration['build_directory'] == '') {
+      _environmentOverrides = {
         'DART_CONFIGURATION' : TestUtils.configurationDir(configuration)
-    };
+      };
+    }
   }
 
   Map<String, String> get environmentOverrides => _environmentOverrides;
 
   /**
    * Whether or not binaries should be found in the root build directory or
    * in the built SDK.
    */
   bool get useSdk {
     // The pub suite always uses the SDK.
@@ skipping 2111 matching lines @@
     // is relative to the current working directory.
     // Thus, if we pass in an absolute path (e.g. '--build-directory=/tmp/out')
     // we get into trouble.
     if (configuration['build_directory'] != '') {
       return configuration['build_directory'];
     }
 
     return "${outputDir(configuration)}${configurationDir(configuration)}";
   }
 
-  static getValidOutputDir(Map configuration, String mode, String arch) {
+  static String configurationDir(Map configuration) {
+    // This returns the correct configuration directory (the last component
+    // of the output directory path) for regular dart checkouts.
+    // Do not call this function if the --build-directory option is used.
+    // Dartium checkouts use the --build-directory option to pass in the
+    // correct build directory explicitly.
     // We allow our code to have been cross compiled, i.e., that there
     // is an X in front of the arch. We don't allow both a cross compiled
     // and a normal version to be present (except if you specifically pass
     // in the build_directory).
+    if (configuration['build_directory'] != '') {
+      throw "Internal test.dart error: Don't call TestUtils.configurationDir "
+            "if the --build-directory option is used.";
+    }
+    var mode = (configuration['mode'] == 'debug') ? 'Debug' : 'Release';
+    var arch = configuration['arch'].toUpperCase();
     var normal = '$mode$arch';
     var cross = '${mode}X$arch';
     var outDir = outputDir(configuration);
     var normalDir = new Directory(new Path('$outDir$normal').toNativePath());
     var crossDir = new Directory(new Path('$outDir$cross').toNativePath());
     if (normalDir.existsSync() && crossDir.existsSync()) {
       throw "You can't have both $normalDir and $crossDir, we don't know which"
             " binary to use";
     }
     if (crossDir.existsSync()) {
       return cross;
     }
     return normal;
   }
 
-  static String configurationDir(Map configuration) {
-    // For regular dart checkouts, the configDir by default is mode+arch.
-    // For Dartium, the configDir by default is mode (as defined by the Chrome
-    // build setup). We can detect this because in the dartium checkout, the
-    // "output" directory is a sibling of the dart directory instead of a child.
-    var mode = (configuration['mode'] == 'debug') ? 'Debug' : 'Release';
-    var arch = configuration['arch'].toUpperCase();
-    if (currentWorkingDirectory != dartDir) {
-      return getValidOutputDir(configuration, mode, arch);
-    } else {
-      return mode;
-    }
-  }
-
   /**
    * Returns the path to the dart binary checked into the repo, used for
    * bootstrapping test.dart.
    */
   static Path get dartTestExecutable {
     var path = '$dartDir/tools/testing/bin/'
         '${Platform.operatingSystem}/dart';
     if (Platform.operatingSystem == 'windows') {
       path = '$path.exe';
     }
@@ skipping 88 matching lines @@
       for (var key in PATH_REPLACEMENTS.keys) {
         if (path.startsWith(key)) {
           path = path.replaceFirst(key, PATH_REPLACEMENTS[key]);
           break;
         }
       }
     }
     return path;
   }
 }