Enable cross compiled outputs in the testing scripts

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 2050 matching lines @@
       compiler == 'dartanalyzer' || compiler == 'dart2analyzer';
 
   static String buildDir(Map configuration) {
     // FIXME(kustermann,ricow): Our code assumes that the returned 'buildDir'
     // 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'];
     }
-    var outputDir = '';
-    var system = configuration['system'];
-    if (system == 'linux') {
-      outputDir = 'out/';
-    } else if (system == 'macos') {
-      outputDir = 'xcodebuild/';
-    } else if (system == 'windows') {
-      outputDir = 'build/';
+    
+    return "${outputDir(configuration)}${configurationDir(configuration)}";
+  }
+
+  static getValidOutputDir(Map configuration, String mode, String arch) {
+    // 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).
+    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()) {

[Bill Hesse, 2014/03/13 11:59:39]

Why not
if normal
  if cross
    error both
  else 
    return normal
else if cross
  return cross
else 
  error none?

[ricow1, 2014/03/13 12:04:39]

That would change the current semantics in the common normal case - I don't want
to mix that up with fixing the cross compilation
Additionally, the logic there is much harder to follow

+      throw "You can't have both $normalDir and $crossDir, we don't know which"
+            " binary to use";
     }
-    return "$outputDir${configurationDir(configuration)}";
+    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 '$mode$arch';
+      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 {
@@ skipping 80 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }