Removes a redundant mode_arch component from paths for generated tests

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 467 matching lines @@
         dartWrapperFilename = testPath;
         // TODO(whesse): Once test.py is retired, adjust the relative path in
         // the client/samples/dartcombat test to its css file, remove the
         // "../../" from this path, and move this out of the isWebTest guard.
         // Also remove getHtmlName, and just use test.html.
         // TODO(efortuna): this shortening of htmlFilename is a band-aid until
         // the above TODO gets fixed. Windows cannot have paths that are longer
         // than 260 characters, and without this hack, we were running past the
         // the limit.
         String htmlFilename = getHtmlName(filename);
-        while ('${tempDir.path}/../../$htmlFilename'.length >= 260) {
+        while ('${tempDir.path}/../$htmlFilename'.length >= 260) {
           htmlFilename = htmlFilename.substring(htmlFilename.length~/2);
         }
-        htmlPath = '${tempDir.path}/../../$htmlFilename';
+        htmlPath = '${tempDir.path}/../$htmlFilename';
       }
       final String scriptPath = (component == 'dartium') ?
           dartWrapperFilename : compiledDartWrapperFilename;
       // Create the HTML file for the test.
       RandomAccessFile htmlTest = new File(htmlPath).openSync(FileMode.WRITE);
       String filePrefix = '';
       if (new Platform().operatingSystem() == 'windows') {
         // Firefox on Windows does not like absolute file path names that start
         // with 'C:' adding 'file:///' solves the problem.
         filePrefix = 'file:///';
@@ skipping 68 matching lines @@
       doTest(testCase);
     }
   }
 
   /** Helper to create a compilation command for a single input file. */
   Command _compileCommand(String inputFile, String outputFile,
       String component, String dir, var vmOptions) {
     String executable = TestUtils.compilerPath(configuration);
     List<String> args = TestUtils.standardOptions(configuration);
     switch (component) {
+      // TODO(zundel): Remove chromium now that dartc doesn't generate code?
       case 'chromium':
         args.addAll(['--work', dir]);
         args.addAll(vmOptions);
         args.add('--ignore-unrecognized-flags');
-        // TODO(zundel): remove assumption of generated code from dartc
-        args.add('--out');
-        args.add(outputFile);
         args.add(inputFile);
         // TODO(whesse): Add --fatal-type-errors if needed.
         break;
       case 'frogium':
       case 'legium':
       case 'webdriver':
         String libdir = configuration['froglib'];
         if (libdir == '') {
           libdir = '$dartDir/frog/lib';
         }
@@ skipping 33 matching lines @@
    * of levels down in the checkout as the original path of the web test.
    */
   Directory createOutputDirectory(String testPath, String optionsName) {
     String testUniqueName =
         testPath.substring(dartDir.length + 1, testPath.length - 5);
     testUniqueName = testUniqueName.replaceAll('/', '_');
     testUniqueName += '-$optionsName';
 
     // Create '[build dir]/generated_tests/$component/$testUniqueName',
       // including any intermediate directories that don't exist.
-    String debugMode =
-        (configuration['mode'] == 'debug') ? 'Debug_' : 'Release_';
-    var generatedTestPath = [debugMode + configuration["arch"],
-                             'generated_tests',
+    var generatedTestPath = ['generated_tests',
                              configuration['component'],
                              testUniqueName];
 
     String tempDirPath = TestUtils.buildDir(configuration);
     if (requiresCleanTemporaryDirectory) {
       tempDirPath = globalTemporaryDirectory();
+      String debugMode =
+        (configuration['mode'] == 'debug') ? 'Debug_' : 'Release_';
+         debugMode + configuration["arch"];

[Bill Hesse, 2012/03/05 16:58:00]

I think you mean debugMode += configuration["arch"].
Wouldn't 
generatedTestPath = [debugMode +
configuration["arch"]].addAll(generatedTestPath);
be better?

or ( ... == 'debug') ? 
    'Debug_${configuration["arch"] :
    'Release_${configuration["arch"];

Remember they are taking away string concatenation (I think).


Actually - there is no need for this to match the build directory name anymore. 
Just use "${configuration['mode']_configuration['arch']".  You could even add it
to the end of the generatedTestPath, not the beginning.  You just need to make
the path different for different modes and arch.

+      generatedTestPath.insertRange(0, 1, debugMode);
+      print("generatedTestPath is: ${generatedTestPath}");
+
     }
     Directory tempDir = new Directory(tempDirPath);
     if (!tempDir.existsSync()) {
       // Dartium tests can be run with no build step, with no output directory.
       // This special case builds the build directory that should be there.
       var buildPath = tempDirPath.split('/');
       tempDirPath = buildPath[0];
       if (tempDirPath == '') {
         throw new Exception(
             'Non-relative path to build directory in test_suite.dart');
@@ skipping 558 matching lines @@
  * $noCrash tests are expected to be flaky but not crash
  * $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
 """;
     print(report);
    }
 }