Removes a redundant mode_arch component from paths for generated tests

tools/testing/dart/test_suite.dart

Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index 80fc822033df6f5b8a65c6ecb0093790011524d8..01ca1b3027a63344e09c206c0c8fe6127fdad998 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -485,10 +485,10 @@ class StandardTestSuite implements TestSuite {
         // 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;
@@ -577,13 +577,11 @@ class StandardTestSuite implements TestSuite {
     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;
@@ -637,16 +635,19 @@ class StandardTestSuite implements TestSuite {
 
     // 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()) {