| Index: tools/testing/dart/status_file_parser.dart
|
| diff --git a/tools/testing/dart/status_file_parser.dart b/tools/testing/dart/status_file_parser.dart
|
| index c29f9f584a4ff8f45f4330a9b52479ada8d1cbd6..39876e3021200b1809cac9200056b05921c3c840 100644
|
| --- a/tools/testing/dart/status_file_parser.dart
|
| +++ b/tools/testing/dart/status_file_parser.dart
|
| @@ -204,13 +204,22 @@ class TestExpectations {
|
|
|
| _map.forEach((key, expectation) {
|
| List regExps = _keyToRegExps[key];
|
| - if (regExps.length > splitFilename.length) return;
|
| - for (var i = 0; i < regExps.length; i++) {
|
| - if (!regExps[i].hasMatch(splitFilename[i])) return;
|
| + if (true || _complexMatching) {
|
| + if (regExps.length > splitFilename.length) return;
|
| + for (var i = 0; i < regExps.length; i++) {
|
| + if (!regExps[i].hasMatch(splitFilename[i])) return;
|
| + }
|
| + // If all components of the status file key matches the filename
|
| + // add the expectations to the result.
|
| + result.addAll(expectation);
|
| + } else {
|
| + // TODO(whesse): Make paths match completely for non-co19 matching.
|
| + if (splitFilename.length > 1) {
|
| + print('Filename with path separator used to match: $filename');
|
| + } else if (regExps[regExps.length - 1].hasMatch(splitFilename[0])) {
|
| + result.addAll(expectation);
|
| + }
|
| }
|
| - // If all components of the status file key matches the filename
|
| - // add the expectations to the result.
|
| - result.addAll(expectation);
|
| });
|
|
|
| // If no expectations were found the expectation is that the test
|
|
|