Implement fromEnvironment on bool, int, String in dart2js.

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 749 matching lines @@
     bool negative = info.hasCompileError ||
         (configuration['checked'] && info.isNegativeIfChecked);
     if (info.hasRuntimeError && hasRuntime) {
       negative = true;
     }
     return negative;
   }
 
   List<Command> makeCommands(TestInformation info, var vmOptions, var args) {
     var compiler = configuration['compiler'];
+    List<String> sharedOptions = info.optionsFromFile['sharedOptions'];
     switch (compiler) {
     case 'dart2js':
       args = new List.from(args);
       String tempDir = createCompilationOutputDirectory(info.filePath);
+      if (sharedOptions != null) {
+        args.addAll(sharedOptions);
+      }

[kustermann, 2013/10/30 13:49:07]

If you do it here, do it for dart2dart below as well.

[ngeoffray, 2013/10/30 14:39:48]

Done.

       args.add('--out=$tempDir/out.js');
 
       var command = CommandBuilder.instance.getCompilationCommand(
           compiler, "$tempDir/out.js", !useSdk,
           dart2JsBootstrapDependencies, compilerPath, args, configurationDir);
 
       List<Command> commands = <Command>[command];
       if (info.hasCompileError) {
         // Do not attempt to run the compiled result. A compilation
         // error should be reported by the compilation command.
       } else if (configuration['runtime'] == 'd8') {
         commands.add(CommandBuilder.instance.getJSCommandlineCommand(
             "d8", d8FileName, ['$tempDir/out.js'], configurationDir));
       } else if (configuration['runtime'] == 'jsshell') {
         commands.add(CommandBuilder.instance.getJSCommandlineCommand(
             "jsshell", jsShellFileName, ['$tempDir/out.js'], configurationDir));
       }
       return commands;
     case 'dart2dart':
       args = new List.from(args);

[ricow1, 2013/10/30 13:51:19]

we may need to add support for dart2dart as well

[ngeoffray, 2013/10/30 14:39:48]

Done.

       args.add('--output-type=dart');
       String tempDir = createCompilationOutputDirectory(info.filePath);
       args.add('--out=$tempDir/out.dart');
 
       List<Command> commands =
           <Command>[CommandBuilder.instance.getCompilationCommand(
               compiler, "$tempDir/out.dart", !useSdk,
               dart2JsBootstrapDependencies, compilerPath, args,
               configurationDir)];
       if (info.hasCompileError) {
         // Do not attempt to run the compiled result. A compilation
         // error should be reported by the compilation command.
       } else if (configuration['runtime'] == 'vm') {
         // TODO(antonm): support checked.
         var vmArguments = new List.from(vmOptions);
         vmArguments.addAll([
             '--ignore-unrecognized-flags', '$tempDir/out.dart']);
         commands.add(CommandBuilder.instance.getVmCommand(
             vmFileName, vmArguments, configurationDir));
       } else {
         throw 'Unsupported runtime ${configuration["runtime"]} for dart2dart';
       }
       return commands;
 
     case 'none':
       var arguments = new List.from(vmOptions);
+      if (sharedOptions != null) {
+        arguments.addAll(sharedOptions);
+      }

[kustermann, 2013/10/30 13:49:07]

There have to be other places where we setup the options for
content_shell/dartium.
Could you add this there as well?

[ngeoffray, 2013/10/30 14:39:48]

As discussed, we don't want to test this in drt/dartium.

       arguments.addAll(args);
       return <Command>[CommandBuilder.instance.getVmCommand(
           dartShellFileName, arguments, configurationDir)];
 
     case 'dartanalyzer':
     case 'dart2analyzer':
       return <Command>[makeAnalysisCommand(info, args)];
 
     default:
       throw 'Unknown compiler ${configuration["compiler"]}';
@@ skipping 569 matching lines @@
    *   executing the copy command printed by the test script.
    *
    * This method is static as the map is cached and shared amongst
    * configurations, so it may not use [configuration].
    */
   Map readOptionsFromFile(Path filePath) {
     if (filePath.segments().contains('co19')) {
       return readOptionsFromCo19File(filePath);
     }
     RegExp testOptionsRegExp = new RegExp(r"// VMOptions=(.*)");
+    RegExp sharedOptionsRegExp = new RegExp(r"// SharedOptions=(.*)");
     RegExp dartOptionsRegExp = new RegExp(r"// DartOptions=(.*)");
     RegExp otherScriptsRegExp = new RegExp(r"// OtherScripts=(.*)");
     RegExp packageRootRegExp = new RegExp(r"// PackageRoot=(.*)");
     RegExp multiHtmlTestRegExp =
         new RegExp(r"useHtmlIndividualConfiguration()");
     RegExp isolateStubsRegExp = new RegExp(r"// IsolateStubs=(.*)");
     // TODO(gram) Clean these up once the old directives are not supported.
     RegExp domImportRegExp =
         new RegExp(r"^[#]?import.*dart:(html|web_audio|indexed_db|svg|web_sql)",
         multiLine: true);
 
     var bytes = new File(filePath.toNativePath()).readAsBytesSync();
     String contents = decodeUtf8(bytes);
     bytes = null;
 
     // Find the options in the file.
     List<List> result = new List<List>();
     List<String> dartOptions;
+    List<String> sharedOptions;
     String packageRoot;
 
     Iterable<Match> matches = testOptionsRegExp.allMatches(contents);
     for (var match in matches) {
       result.add(match[1].split(' ').where((e) => e != '').toList());
     }
     if (result.isEmpty) result.add([]);
 
     matches = dartOptionsRegExp.allMatches(contents);
     for (var match in matches) {
       if (dartOptions != null) {
         throw new Exception(
             'More than one "// DartOptions=" line in test $filePath');
       }
       dartOptions = match[1].split(' ').where((e) => e != '').toList();
     }
 
+    matches = sharedOptionsRegExp.allMatches(contents);
+    for (var match in matches) {
+      if (sharedOptions != null) {
+        throw new Exception(
+            'More than one "// DartOptions=" line in test $filePath');

[kustermann, 2013/10/30 13:49:07]

DartOptions => SharedOptions

[ricow1, 2013/10/30 13:51:19]

DartOptions -> SharedOptions

+      }
+      sharedOptions = match[1].split(' ').where((e) => e != '').toList();
+    }
+
     matches = packageRootRegExp.allMatches(contents);
     for (var match in matches) {
       if (packageRoot != null) {
         throw new Exception(
             'More than one "// PackageRoot=" line in test $filePath');
       }
       packageRoot = match[1];
       if (packageRoot != 'none') {
         // PackageRoot=none means that no package-root option should be given.
         packageRoot = '${filePath.directoryPath.join(new Path(packageRoot))}';
@@ skipping 20 matching lines @@
     // top-level "groups" so tests running nested groups will be no-ops.
     RegExp numTests = new RegExp(r"\s*[^/]\s*group\('[^,']*");
     List<String> subtestNames = [];
     Iterator matchesIter = numTests.allMatches(contents).iterator;
     while(matchesIter.moveNext() && isMultiHtmlTest) {
       String fullMatch = matchesIter.current.group(0);
       subtestNames.add(fullMatch.substring(fullMatch.indexOf("'") + 1));
     }
 
     return { "vmOptions": result,
+             "sharedOptions": sharedOptions,
              "dartOptions": dartOptions,
              "packageRoot": packageRoot,
              "hasCompileError": false,
              "hasRuntimeError": false,
              "hasStaticWarning" : false,
              "otherScripts": otherScripts,
              "isMultitest": isMultitest,
              "isMultiHtmlTest": isMultiHtmlTest,
              "subtestNames": subtestNames,
              "isolateStubs": isolateStubs,
@@ skipping 48 matching lines @@
       // expectations accordingly.
 
       // Using stderr.writeString to avoid breaking dartc/junit_tests
       // which parses the output of the --list option.
       stderr.writeln(
           "Warning: deprecated @dynamic-type-error tag used in $filePath");
     }
 
     return {
       "vmOptions": <List>[[]],
+      "sharedOptions": null,
       "dartOptions": null,
       "packageRoot": null,
       "hasCompileError": hasCompileError,
       "hasRuntimeError": hasRuntimeError,
       "hasStaticWarning" : hasStaticWarning,
       "otherScripts": <String>[],
       "isMultitest": isMultitest,
       "isMultiHtmlTest": false,
       "subtestNames": <String>[],
       "isolateStubs": '',
@@ skipping 476 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);
    }
 }