| Index: dart/tools/testing/dart/multitest.dart
|
| diff --git a/dart/tools/testing/dart/multitest.dart b/dart/tools/testing/dart/multitest.dart
|
| index 45751412aca84610c67269607e63908e0291a708..418bd3803088d28b2a1aa22438699eef53e4a13c 100644
|
| --- a/dart/tools/testing/dart/multitest.dart
|
| +++ b/dart/tools/testing/dart/multitest.dart
|
| @@ -154,8 +154,8 @@ class _Annotation {
|
| // Find all relative imports and copy them into the dir that contains
|
| // the generated tests.
|
| Set<Path> _findAllRelativeImports(Path topLibrary) {
|
| - Set<String> toSearch = new Set<Path>.from([topLibrary]);
|
| - Set<String> foundImports = new HashSet<Path>();
|
| + Set<Path> toSearch = new Set<Path>.from([topLibrary]);
|
| + Set<Path> foundImports = new HashSet<Path>();
|
| Path libraryDir = topLibrary.directoryPath;
|
| // Matches #import( or #source( followed by " or ' followed by anything
|
| // except dart:, dart-ext: or /, at the beginning of a line.
|
| @@ -193,13 +193,8 @@ void DoMultitest(Path filePath,
|
| Path suiteDir,
|
| // TODO(zundel): Are the boolean flags now redundant
|
| // with the 'multitestOutcome' field?
|
| - Function doTest(Path filePath,
|
| - bool isNegative,
|
| - [bool isNegativeIfChecked,
|
| - bool hasFatalTypeErrors,
|
| - bool hasRuntimeErrors,
|
| - Set<String> multitestOutcome]),
|
| - Function multitestDone) {
|
| + CreateTest doTest,
|
| + VoidFunction multitestDone) {
|
| // Each new test is a single String value in the Map tests.
|
| Map<String, String> tests = new Map<String, String>();
|
| Map<String, Set<String>> outcomes = new Map<String, Set<String>>();
|
| @@ -244,10 +239,10 @@ void DoMultitest(Path filePath,
|
| bool isNegativeIfChecked = outcome.contains('dynamic type error');
|
| doTest(multitestFilename,
|
| isNegative,
|
| - isNegativeIfChecked,
|
| - enableFatalTypeErrors,
|
| - hasRuntimeErrors,
|
| - outcome);
|
| + isNegativeIfChecked: isNegativeIfChecked,
|
| + hasFatalTypeErrors: enableFatalTypeErrors,
|
| + hasRuntimeErrors: hasRuntimeErrors,
|
| + multitestOutcome: outcome);
|
| }
|
| multitestDone();
|
| });
|
|
|