Add support for the new analyzer to the testing scripts

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 124 matching lines @@
    * The path to the compiler for this suite's configuration. Returns `null` if
    * no compiler should be used.
    */
   String get compilerPath {
     if (configuration['compiler'] == 'none') {
       return null;  // No separate compiler for dartium tests.
     }
     var name;
     switch (configuration['compiler']) {
       case 'dartc':
+      case 'new_analyzer':
         name = executablePath;
       case 'dart2js':
       case 'dart2dart':
         var prefix = 'sdk/bin/';
         String suffix = getExecutableSuffix(configuration['compiler']);
         if (configuration['host_checked']) {
           // The script dart2js_developer is not included in the
           // shipped SDK, that is the script is not installed in
           // "$buildDir/dart-sdk/bin/"
           name = '$prefix/dart2js_developer$suffix';
@@ skipping 19 matching lines @@
   String get executablePath {
     var suffix = getExecutableSuffix(configuration['compiler']);
     switch (configuration['compiler']) {
       case 'none':
         if (useSdk) {
           return '$buildDir/dart-sdk/bin/dart$suffix';
         }
         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 not '.bat').

[ricow1, 2013/03/12 18:06:06]

No it will actually be .bat if the file is not explicitly dart or d8

       default:
         throw "Unknown executable for: ${configuration['compiler']}";
     }
   }
 
   /**
    * The file name of the d8 executable.
    */
   String get d8FileName {
     var suffix = getExecutableSuffix('d8');
@@ skipping 498 matching lines @@
 
   void enqueueStandardTest(TestInformation info,
                            String testName,
                            Set<String> expectations) {
     bool isNegative = info.hasCompileError ||
         (configuration['checked'] && info.isNegativeIfChecked);
     if (info.hasRuntimeError && hasRuntime) {
       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;
       }
     }
 
     var commonArguments = commonArgumentsFromFile(info.filePath,
                                                   info.optionsFromFile);
 
     List<List<String>> vmOptionsList = getVmOptions(info.optionsFromFile);
@@ skipping 54 matching lines @@
         vmArguments.addAll([
             '--ignore-unrecognized-flags', '$tempDir/out.dart']);
         commands.add(new Command(vmFileName, vmArguments));
       } else {
         throw 'Unsupported runtime ${configuration["runtime"]} for dart2dart';
       }
       return commands;
 
     case 'none':
     case 'dartc':
+    case 'new_analyzer':
       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) {
@@ skipping 368 matching lines @@
     return new File.fromPath(generatedTestPath).fullPathSync()
         .replaceAll('\\', '/');
   }
 
   String get scriptType {
     switch (configuration['compiler']) {
       case 'none':
       case 'dart2dart':
         return 'application/dart';
       case 'dart2js':
+      case 'new_analyzer':
       case 'dartc':
         return 'text/javascript';
       default:
         Expect.fail('Non-web runtime, so no scriptType for: '
                     '${configuration["compiler"]}');
         return null;
     }
   }
 
   bool get hasRuntime {
@@ skipping 40 matching lines @@
   }
 
   List<String> commonArgumentsFromFile(Path filePath, Map optionsFromFile) {
     List args = TestUtils.standardOptions(configuration);
 
     String packageRoot = packageRootArgument(optionsFromFile['packageRoot']);
     if (packageRoot != null) {
       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 the old one?

[ricow1, 2013/03/12 18:06:06]

Yes

       args.add('machine');
     }
 
     bool isMultitest = optionsFromFile["isMultitest"];
     List<String> dartOptions = optionsFromFile["dartOptions"];
     List<List<String>> vmOptionsList = getVmOptions(optionsFromFile);
     Expect.isTrue(!isMultitest || dartOptions == null);
     if (dartOptions == null) {
       args.add(filePath.toNativePath());
     } else {
@@ skipping 354 matching lines @@
   bool isTestFile(String filename) => filename.endsWith("Tests.java") &&
       !filename.contains('com/google/dart/compiler/vm') &&
       !filename.contains('com/google/dart/corelib/SharedTests.java');
 
   void forEachTest(TestCaseEvent onTest,
                    Map testCacheIgnored,
                    [VoidFunction onDone]) {
     doTest = onTest;
     doDone = onDone;
 
-    if (configuration['compiler'] != 'dartc') {
+    if (!configuration['analyzer']) {
       // Do nothing. Asynchronously report that the suite is enqueued.
       asynchronously(doDone);
       return;
     }
     RegExp pattern = configuration['selectors']['dartc'];
     if (!pattern.hasMatch('junit_tests')) {
       asynchronously(doDone);
       return;
     }
 
@@ skipping 233 matching lines @@
     ];
     return BROWSERS.contains(runtime);
   }
 
   static bool isBrowserRuntime(String runtime) =>
       runtime == 'drt' || TestUtils.usesWebDriver(runtime);
 
   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.
     // Thus, if we pass in an absolute path (e.g. '--build-directory=/tmp/out')
     // we get into trouble.
     if (configuration['build_directory'] != '') {
       return configuration['build_directory'];
     }
     var outputDir = '';
     var system = configuration['system'];
@@ skipping 86 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);
    }
 }