Chromium Code Reviews| Index: tools/testing/dart/test_suite.dart |
| =================================================================== |
| --- tools/testing/dart/test_suite.dart (revision 19852) |
| +++ tools/testing/dart/test_suite.dart (working copy) |
| @@ -142,6 +142,7 @@ |
| var name; |
| switch (configuration['compiler']) { |
| case 'dartc': |
| + case 'new_analyzer': |
| name = executablePath; |
| case 'dart2js': |
| case 'dart2dart': |
| @@ -181,6 +182,9 @@ |
| return '$buildDir/dart$suffix'; |
| case 'dartc': |
| return '$buildDir/analyzer/bin/dart_analyzer$suffix'; |
| + case 'new_analyzer': |
| + var prefix = 'sdk/bin/'; |
| + return '$prefix/analyzer$suffix'; |
|
kustermann
2013/03/12 17:55:23
'$suffix' will probably be '.exe' on windows (and
ricow1
2013/03/12 18:06:06
No it will actually be .bat if the file is not exp
|
| default: |
| throw "Unknown executable for: ${configuration['compiler']}"; |
| } |
| @@ -699,8 +703,8 @@ |
| isNegative = true; |
| } |
| - if (configuration['compiler'] == 'dartc') { |
| - // dartc can detect static type warnings by the |
| + if (configuration['analyzer']) { |
| + // An analyzer can detect static type warnings by the |
| // format of the error line |
| if (info.hasFatalTypeErrors) { |
| isNegative = true; |
| @@ -775,6 +779,7 @@ |
| case 'none': |
| case 'dartc': |
| + case 'new_analyzer': |
| var arguments = new List.from(vmOptions); |
| arguments.addAll(args); |
| return <Command>[new Command(dartShellFileName, arguments)]; |
| @@ -1163,6 +1168,7 @@ |
| case 'dart2dart': |
| return 'application/dart'; |
| case 'dart2js': |
| + case 'new_analyzer': |
| case 'dartc': |
| return 'text/javascript'; |
| default: |
| @@ -1223,7 +1229,7 @@ |
| args.add(packageRoot); |
| } |
| args.addAll(additionalOptions(filePath)); |
| - if (configuration['compiler'] == 'dartc') { |
| + if (configuration['analyzer']) { |
| args.add('--error_format'); |
|
kustermann
2013/03/12 17:55:23
Does the new analyzer accept the same arguments as
ricow1
2013/03/12 18:06:06
Yes
|
| args.add('machine'); |
| } |
| @@ -1599,7 +1605,7 @@ |
| doTest = onTest; |
| doDone = onDone; |
| - if (configuration['compiler'] != 'dartc') { |
| + if (!configuration['analyzer']) { |
| // Do nothing. Asynchronously report that the suite is enqueued. |
| asynchronously(doDone); |
| return; |
| @@ -1853,6 +1859,9 @@ |
| static bool isJsCommandLineRuntime(String runtime) => |
| const ['d8', 'jsshell'].contains(runtime); |
| + static bool isCommandLineAnalyzer(String compiler) => |
| + compiler == 'dartc' || compiler == 'new_analyzer'; |
| + |
| static String buildDir(Map configuration) { |
| // FIXME(kustermann,ricow): Our code assumes that the returned 'buildDir' |
| // is relative to the current working directory. |