Fix warnings_checker.dart handling of multitests

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 18 matching lines @@
 
 import "compiler_configuration.dart"
     show CommandArtifact, CompilerConfiguration;
 
 import "runtime_configuration.dart" show RuntimeConfiguration;
 
 import 'browser_test.dart';
 
 RegExp multiHtmlTestGroupRegExp = new RegExp(r"\s*[^/]\s*group\('[^,']*");
 RegExp multiHtmlTestRegExp = new RegExp(r"useHtmlIndividualConfiguration()");
-// Require at least one non-space character before '///'
+// Require at least one non-space character before '//[/#]'
 RegExp multiTestRegExp = new RegExp(r"\S *"
-    r"/// \w+:(.*)");
+    r"//[#/] \w+:(.*)");
 RegExp dartExtension = new RegExp(r'\.dart$');
 
 /**
  * A simple function that tests [arg] and returns `true` or `false`.
  */
 typedef bool Predicate<T>(T arg);
 
 typedef void CreateTest(Path filePath, Path originTestPath,
     bool hasCompileError, bool hasRuntimeError,
     {bool isNegativeIfChecked,
@@ skipping 249 matching lines @@
     }
     // Test if the selector includes this test.
     RegExp pattern = configuration['selectors'][suiteName];
     if (!pattern.hasMatch(testCase.displayName)) {
       return;
     }
 
     if (configuration['hot_reload'] || configuration['hot_reload_rollback']) {
       // Handle reload special cases.
       if (expectations.contains(Expectation.COMPILETIME_ERROR) ||
-          testCase.hasCompileError || testCase.expectCompileError) {
+          testCase.hasCompileError ||
+          testCase.expectCompileError) {
         // Running a test that expects a compilation error with hot reloading
         // is redundant with a regular run of the test.
         return;
       }
     }
 
     // Update Summary report
     if (configuration['report']) {
       if (testCase.expectCompileError &&
           TestUtils.isBrowserRuntime(configuration['runtime']) &&
@@ skipping 54 matching lines @@
     return testName;
   }
 
   /**
    * Create a directories for generated assets (tests, html files,
    * pubspec checkouts ...).
    */
 
   String createOutputDirectory(Path testPath, String optionsName) {
     var checked = configuration['checked'] ? '-checked' : '';
-    var strong =  configuration['strong'] ? '-strong' : '';
+    var strong = configuration['strong'] ? '-strong' : '';
     var minified = configuration['minified'] ? '-minified' : '';
     var sdk = configuration['use_sdk'] ? '-sdk' : '';
     var dirName = "${configuration['compiler']}-${configuration['runtime']}"
         "$checked$strong$minified$sdk";
     return createGeneratedTestDirectoryHelper(
         "tests", dirName, testPath, optionsName);
   }
 
   String createCompilationOutputDirectory(Path testPath) {
     var checked = configuration['checked'] ? '-checked' : '';
-    var strong =  configuration['strong'] ? '-strong' : '';
+    var strong = configuration['strong'] ? '-strong' : '';
     var minified = configuration['minified'] ? '-minified' : '';
     var csp = configuration['csp'] ? '-csp' : '';
     var sdk = configuration['use_sdk'] ? '-sdk' : '';
     var dirName = "${configuration['compiler']}"
         "$checked$strong$minified$csp$sdk";
     return createGeneratedTestDirectoryHelper(
         "compilations", dirName, testPath, "");
   }
 
   String createPubspecCheckoutDirectory(Path directoryOfPubspecYaml) {
@@ skipping 419 matching lines @@
       enqueueTestCaseFromTestInformation(info);
       return;
     }
     if (!isTestFile(filename)) return;
     Path filePath = new Path(filename);
 
     var optionsFromFile = readOptionsFromFile(filePath);
     CreateTest createTestCase = makeTestCaseCreator(optionsFromFile);
 
     if (optionsFromFile['isMultitest']) {
-      group.add(doMultitest(filePath,
-                            buildDir,
-                            suiteDir,
-                            createTestCase,
-                            (configuration['hot_reload'] ||
-                             configuration['hot_reload_rollback'])));
+      group.add(doMultitest(
+          filePath,
+          buildDir,
+          suiteDir,
+          createTestCase,
+          (configuration['hot_reload'] ||
+              configuration['hot_reload_rollback'])));
     } else {
       createTestCase(filePath, filePath, optionsFromFile['hasCompileError'],
           optionsFromFile['hasRuntimeError'],
           hasStaticWarning: optionsFromFile['hasStaticWarning']);
     }
   }
 
   static Path _findPubspecYamlFile(Path filePath) {
     final existsCache = TestUtils.existsCache;
 
@@ skipping 273 matching lines @@
    */
   void enqueueBrowserTest(List<Command> baseCommands, Path packageRoot,
       Path packages, TestInformation info, String testName, expectations) {
     RegExp badChars = new RegExp('[-=/]');
     List VmOptionsList = getVmOptions(info.optionsFromFile);
     bool multipleOptions = VmOptionsList.length > 1;
     for (var vmOptions in VmOptionsList) {
       String optionsName =
           multipleOptions ? vmOptions.join('-').replaceAll(badChars, '') : '';
       String tempDir = createOutputDirectory(info.filePath, optionsName);
-      enqueueBrowserTestWithOptions(baseCommands, packageRoot, packages,
-          info, testName, expectations, vmOptions, tempDir);
+      enqueueBrowserTestWithOptions(baseCommands, packageRoot, packages, info,
+          testName, expectations, vmOptions, tempDir);
     }
   }
 
   void enqueueBrowserTestWithOptions(
       List<Command> baseCommands,
       Path packageRoot,
       Path packages,
       TestInformation info,
       String testName,
       expectations,
@@ skipping 246 matching lines @@
       String dir, optionsFromFile) {
     assert(compiler == 'dart2js');
     List<String> args;
     if (compilerPath.endsWith('.dart')) {
       // Run the compiler script via the Dart VM.
       args = [compilerPath];
     } else {
       args = [];
     }
     args.addAll(TestUtils.standardOptions(configuration));
-    String packages = packagesArgument(optionsFromFile['packageRoot'],
-                                       optionsFromFile['packages']);
+    String packages = packagesArgument(
+        optionsFromFile['packageRoot'], optionsFromFile['packages']);
     if (packages != null) args.add(packages);
     args.add('--out=$outputFile');
     args.add(inputFile);
     List<String> options = optionsFromFile['sharedOptions'];
     if (options != null) args.addAll(options);
     return CommandBuilder.instance.getCompilationCommand(
         compiler,
         outputFile,
         !useSdk,
         dart2JsBootstrapDependencies,
         compilerPath,
         args,
         environmentOverrides);
   }
 
   /** Helper to create a Polymer deploy command for a single HTML file. */
   Command _polymerDeployCommand(
       String inputFile, String outputDir, optionsFromFile) {
     List<String> args = [];
-    String packages = packagesArgument(optionsFromFile['packageRoot'],
-                                       optionsFromFile['packages']);
+    String packages = packagesArgument(
+        optionsFromFile['packageRoot'], optionsFromFile['packages']);
     if (packages != null) args.add(packages);
     args
       ..add('package:polymer/deploy.dart')
       ..add('--test')
       ..add(inputFile)
       ..add('--out')
       ..add(outputDir)
       ..add('--file-filter')
       ..add('.svn');
     if (configuration['csp']) args.add('--csp');
@@ skipping 34 matching lines @@
       final path = dartDir.append(
           '/client/tests/drt/Content Shell.app/Contents/MacOS/Content Shell');
       return path.toNativePath();
     }
     return dartDir.append('client/tests/drt/content_shell').toNativePath();
   }
 
   List<String> commonArgumentsFromFile(Path filePath, Map optionsFromFile) {
     List args = TestUtils.standardOptions(configuration);
 
-    String packages = packagesArgument(optionsFromFile['packageRoot'],
-                                       optionsFromFile['packages']);
+    String packages = packagesArgument(
+        optionsFromFile['packageRoot'], optionsFromFile['packages']);
     if (packages != null) {
       args.add(packages);
     }
     args.addAll(additionalOptions(filePath));
     if (configuration['analyzer']) {
       args.add('--format=machine');
       args.add('--no-hints');
     }
 
     if (configuration["compiler"] == "dart2analyzer" &&
         (filePath.filename.contains("dart2js") ||
             filePath.directoryPath.segments().last.contains('html_common'))) {
       args.add("--use-dart2js-libraries");
     }
 
     bool isMultitest = optionsFromFile["isMultitest"];
     List<String> dartOptions = optionsFromFile["dartOptions"];
 
     assert(!isMultitest || dartOptions == null);
     args.add(filePath.toNativePath());
     if (dartOptions != null) {
       args.addAll(dartOptions);
     }
 
     return args;
   }
 
-  String packagesArgument(String packageRootFromFile,
-                             String packagesFromFile) {
-    if (packageRootFromFile == 'none' ||
-        packagesFromFile == 'none') {
+  String packagesArgument(String packageRootFromFile, String packagesFromFile) {
+    if (packageRootFromFile == 'none' || packagesFromFile == 'none') {
       return null;
     } else if (packagesFromFile != null) {
       return '--packages=$packagesFromFile';
     } else if (packageRootFromFile != null) {
       return '--package-root=$packageRootFromFile';
     } else {
-    return null;
+      return null;
     }
   }
 
   /**
    * Special options for individual tests are currently specified in various
    * ways: with comments directly in test files, by using certain imports, or by
    * creating additional files in the test directories.
    *
    * Here is a list of options that are used by 'test.dart' today:
    *   - Flags can be passed to the vm or dartium process that runs the test by
@@ skipping 179 matching lines @@
       "isMultitest": isMultitest,
       "isMultiHtmlTest": isMultiHtmlTest,
       "subtestNames": subtestNames,
       "isolateStubs": isolateStubs,
       "containsDomImport": containsDomImport
     };
   }
 
   Map optionsFromKernelFile() {
     return const {
-      "vmOptions": const [ const []],
+      "vmOptions": const [const []],
       "sharedOptions": const [],
       "dartOptions": null,
       "packageRoot": null,
       "packages": null,
       "hasCompileError": false,
       "hasRuntimeError": false,
       "hasStaticWarning": false,
       "otherScripts": const [],
       "isMultitest": false,
       "isMultiHtmlTest": false,
@@ skipping 195 matching lines @@
         var checkoutDir =
             createPubPackageBuildsDirectory(absoluteDirectoryPath);
         var cacheDir = new Path(checkoutDir).append("pub-cache").toNativePath();
 
         // Build all commands
         // In order to debug timeouts on the buildbots, We run `pub get` with
         // "--verbose". See https://github.com/dart-lang/sdk/issues/28734.
         var commands = [
           CommandBuilder.instance.getCopyCommand(directory, checkoutDir),
           CommandBuilder.instance.getPubCommand(
-              "get", pubPath, checkoutDir, cacheDir, arguments: ['--verbose'])
+              "get", pubPath, checkoutDir, cacheDir,
+              arguments: ['--verbose'])
         ];
 
         bool containsWebDirectory = dirExists(directoryPath.append('web'));
         bool containsBuildDartFile =
             fileExists(directoryPath.append('build.dart'));
         if (containsBuildDartFile) {
           var dartBinary = new File(dartVmBinaryFileName).absolute.path;
 
           commands.add(CommandBuilder.instance.getProcessCommand(
               "custom_build",
@@ skipping 188 matching lines @@
       var dir = new Directory(path);
       return dir.delete(recursive: true);
     }
   }
 
   static deleteTempSnapshotDirectory(Map configuration) {
     if (configuration['compiler'] == 'dart2app' ||
         configuration['compiler'] == 'dart2appjit' ||
         configuration['compiler'] == 'precompiler') {
       var checked = configuration['checked'] ? '-checked' : '';
-      var strong =  configuration['strong'] ? '-strong' : '';
+      var strong = configuration['strong'] ? '-strong' : '';
       var minified = configuration['minified'] ? '-minified' : '';
       var csp = configuration['csp'] ? '-csp' : '';
       var sdk = configuration['use_sdk'] ? '-sdk' : '';
       var dirName = "${configuration['compiler']}"
           "$checked$strong$minified$csp$sdk";
       String generatedPath = "${TestUtils.buildDir(configuration)}"
           "/generated_compilations/$dirName";
       TestUtils.deleteDirectory(generatedPath);
     }
   }
@@ skipping 181 matching lines @@
         .where((s) => s.isNotEmpty)
         .toList();
   }
 
   /**
    * Gets extra vm options passed to the testing script.
    */
   static List<String> getExtraVmOptions(Map configuration) =>
       getExtraOptions(configuration, 'vm_options');
 
-  static int shortNameCounter = 0;  // Make unique short file names on Windows.
+  static int shortNameCounter = 0; // Make unique short file names on Windows.
 
   static String getShortName(String path) {
     final PATH_REPLACEMENTS = const {
       "pkg_polymer_e2e_test_bad_import_test": "polymer_bi",
       "pkg_polymer_e2e_test_canonicalization_test": "polymer_c16n",
       "pkg_polymer_e2e_test_experimental_boot_test": "polymer_boot",
       "pkg_polymer_e2e_test_good_import_test": "polymer_gi",
       "tests_co19_src_Language_12_Expressions_14_Function_Invocation_":
           "co19_fn_invoke_",
       "tests_co19_src_LayoutTests_fast_css_getComputedStyle_getComputedStyle-":
@@ skipping 62 matching lines @@
       }
       if (path.length > WINDOWS_SHORTEN_PATH_LIMIT) {
         ++shortNameCounter;
         var pathEnd = path.substring(path.length - WINDOWS_PATH_END_LENGTH);
         path = "short${shortNameCounter}_$pathEnd";
       }
     }
     return path;
   }
 }