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

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 597 matching lines @@
         },
         onDone: listCompleter.complete);
   }
 
   void enqueueFile(String filename, FutureGroup group) {
     if (!isTestFile(filename)) return;
     Path filePath = new Path(filename);
 
     // 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].

     } else {
       createTestCase(filePath,
                      optionsFromFile['hasCompileError'],
                      optionsFromFile['hasRuntimeError']);
     }
   }
 
   void enqueueTestCaseFromTestInformation(TestInformation info) {
     var filePath = info.filePath;
     var optionsFromFile = info.optionsFromFile;
@@ skipping 165 matching lines @@
     case 'dart2analyzer':
       var arguments = new List.from(vmOptions);
       arguments.addAll(args);
       return <Command>[new Command(dartShellFileName, arguments)];
 
     default:
       throw 'Unknown compiler ${configuration["compiler"]}';
     }
   }
 
-  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);
+      }
     };
   }
 
 
   /**
    * _createUrlPathFromFile takes a [file], which is either located in the dart
    * or in the build directory, and will return a String representing
    * the relative path to either the dart or the build directory.
    * Thus, the returned [String] will be the path component of the URL
    * corresponding to [file] (the http server serves files relative to the
@@ skipping 1127 matching lines @@
  * $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
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }