test rename overhaul: step 6 - isolate 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 0457b1201559f95437c83714b016f561267dfc5e..c608d84e0bd55cb1499ee91bc87f197db649fb66 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -354,6 +354,8 @@ class StandardTestSuite implements TestSuite {
     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('/');
@@ -374,7 +376,8 @@ class StandardTestSuite implements TestSuite {
         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);
         }