Allow selectors for test.py to match against a subtest of a multitest

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 41bdf2feae1fa188abf5f98a6eb426db77523db4..6abfa34aa66f57bf2f2ee4302a0d7abdc95e4820 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -615,11 +615,10 @@ class StandardTestSuite extends TestSuite {
 
     // Only run the tests that match the pattern.
     RegExp pattern = configuration['selectors'][suiteName];
-    if (!pattern.hasMatch('$filePath')) return;
     if (filePath.filename.endsWith('test_config.dart')) return;
 
     var optionsFromFile = readOptionsFromFile(filePath);
-    CreateTest createTestCase = makeTestCaseCreator(optionsFromFile);
+    CreateTest createTestCase = makeTestCaseCreator(pattern, optionsFromFile);
 
     if (optionsFromFile['isMultitest']) {
       group.add(doMultitest(filePath, buildDir, suiteDir, createTestCase));

[kustermann, 2013/07/05 08:41:37]

doMultitest() will basically call [createTestCase] for every subtest.
So I just moved the check for the pattern match down to [makeTestCaseCreator].

@@ -808,23 +807,25 @@ class StandardTestSuite extends TestSuite {
     }
   }
 
-  CreateTest makeTestCaseCreator(Map optionsFromFile) {
+  CreateTest makeTestCaseCreator(RegExp pattern, Map optionsFromFile) {
     return (Path filePath,
             bool hasCompileError,
             bool hasRuntimeError,
             {bool isNegativeIfChecked: false,
              bool hasFatalTypeErrors: false,
              Set<String> multitestOutcome: null}) {
-      // Cache the test information for each test case.
-      var info = new TestInformation(filePath,
-                                     optionsFromFile,
-                                     hasCompileError,
-                                     hasRuntimeError,
-                                     isNegativeIfChecked,
-                                     hasFatalTypeErrors,
-                                     multitestOutcome);
-      cachedTests.add(info);
-      enqueueTestCaseFromTestInformation(info);
+      if (pattern.hasMatch('$filePath')) {
+        // Cache the test information for each test case.
+        var info = new TestInformation(filePath,
+                                       optionsFromFile,
+                                       hasCompileError,
+                                       hasRuntimeError,
+                                       isNegativeIfChecked,
+                                       hasFatalTypeErrors,
+                                       multitestOutcome);
+        cachedTests.add(info);
+        enqueueTestCaseFromTestInformation(info);
+      }
     };
   }