test rename overhaul: step 6 - isolate 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 336 matching lines @@
     var isNegative = info.isNegative;
 
     // Look up expectations in status files using a modified file path.
     String testName;
     filename = filename.replaceAll('\\', '/');
 
     // See if there's a 'src' directory inside the 'tests' one.
     int testsStart = filename.lastIndexOf('tests/');
     int start = filename.lastIndexOf('src/');
     if (start > testsStart) {
+      // TODO(sigmund): delete this branch once all tests stop using the src/
+      // directoy

[Bob Nystrom, 2012/04/27 16:02:44]

"directory".

[Siggi Cherem (dart-lang), 2012/04/27 17:07:01]

Done.

       testName = filename.substring(start + 4, filename.length - 5);
     } else if (optionsFromFile['isMultitest']) {
       start = filename.lastIndexOf('/');
       int middle = filename.lastIndexOf('_');
       testName = filename.substring(start + 1, middle) + '/' +
           filename.substring(middle + 1, filename.length - 5);
     } else {
       // This case is hit by the dartc client compilation
       // tests. These tests are pretty broken compared to the
       // rest. They use the .dart suffix in the status files. They
       // find tests in weird ways (testing that they contain "#").
       // They need to be redone.
       // TODO(1058): This does not work on Windows.
       start = filename.indexOf(directoryPath);
       if (start != -1) {
         testName = filename.substring(start + directoryPath.length + 1);
       } else {
         testName = filename;
       }
 
-      if (configuration['compiler'] != 'dartc') {
+      if (configuration['compiler'] != 'dartc' ||
+          testName.endsWith('_test.dart')) {
         if (testName.endsWith('.dart')) {
           testName = testName.substring(0, testName.length - 5);
         }
       }
     }
     int shards = configuration['shards'];
     if (shards > 1) {
       int shard = configuration['shard'];
       if (testName.hashCode() % shards != shard - 1) {
         return;
@@ skipping 999 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);
    }
 }