commit ab8510a0a582ccbe6620423a451289a957b4fd80
author Stevie Strickland <sstrickl@google.com> Mon Mar 25 16:18:48 2019 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Mon Mar 25 16:18:48 2019 +0000
tree 0ff24746e4f8b48ee430ebfa355eb9052f9c9acf
parent 580f44aa83872e32ba932612fafadf0d307d5337

[gardening] Fix arguments test for app_jit(k).

The fix for https://github.com/dart-lang/sdk/issues/35960 broke
on app_jit(k) runs, because these expect the arguments to be
passed when creating the jit snapshot. Pass dartOptions along to
computeCompilerArguments as well, so that the
AppJitCompilerConfiguration can add them in appropriately.

Change-Id: I8c7b5a3a1689943db4e6c3785ccaf8bfdb839c2d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/97516
Reviewed-by: Stevie Strickland <sstrickl@google.com>
Commit-Queue: Stevie Strickland <sstrickl@google.com>

tools/testing/dart/compiler_configuration.dart

diff --git a/tools/testing/dart/compiler_configuration.dart b/tools/testing/dart/compiler_configuration.dart
index 7411a16..852f8e7 100644
--- a/tools/testing/dart/compiler_configuration.dart
+++ b/tools/testing/dart/compiler_configuration.dart
@@ -144,6 +144,7 @@
   List<String> computeCompilerArguments(
       List<String> vmOptions,
       List<String> sharedOptions,
+      List<String> dartOptions,
       List<String> dart2jsOptions,
       List<String> ddcOptions,
       List<String> args) {
@@ -235,6 +236,7 @@
   List<String> computeCompilerArguments(
       List<String> vmOptions,
       List<String> sharedOptions,
+      List<String> dartOptions,
       List<String> dart2jsOptions,
       List<String> ddcOptions,
       List<String> args) {
@@ -356,7 +358,12 @@
   }
 
   List<String> computeCompilerArguments(
-      vmOptions, sharedOptions, dart2jsOptions, ddcOptions, args) {
+      List<String> vmOptions,
+      List<String> sharedOptions,
+      List<String> dartOptions,
+      List<String> dart2jsOptions,
+      List<String> ddcOptions,
+      List<String> args) {
     // The result will be passed as an input to [extractArguments]
     // (i.e. the arguments to the [PipelineCommand]).
     return <String>[]
@@ -457,6 +464,7 @@
   List<String> computeCompilerArguments(
       List<String> vmOptions,
       List<String> sharedOptions,
+      List<String> dartOptions,
       List<String> dart2jsOptions,
       List<String> ddcOptions,
       List<String> args) {
@@ -509,6 +517,7 @@
   List<String> computeCompilerArguments(
       List<String> vmOptions,
       List<String> sharedOptions,
+      List<String> dartOptions,
       List<String> dart2jsOptions,
       List<String> ddcOptions,
       List<String> args) {
@@ -809,6 +818,7 @@
   List<String> computeCompilerArguments(
       List<String> vmOptions,
       List<String> sharedOptions,
+      List<String> dartOptions,
       List<String> dart2jsOptions,
       List<String> ddcOptions,
       List<String> originalArguments) {
@@ -889,7 +899,12 @@
   }
 
   List<String> computeCompilerArguments(
-      vmOptions, sharedOptions, dart2jsOptions, ddcOptions, originalArguments) {
+      List<String> vmOptions,
+      List<String> sharedOptions,
+      List<String> dartOptions,
+      List<String> dart2jsOptions,
+      List<String> ddcOptions,
+      List<String> originalArguments) {
     var args = <String>[];
     if (_useEnableAsserts) {
       args.add('--enable_asserts');
@@ -898,7 +913,8 @@
       ..addAll(vmOptions)
       ..addAll(sharedOptions)
       ..addAll(_configuration.sharedOptions)
-      ..addAll(originalArguments);
+      ..addAll(originalArguments)
+      ..addAll(dartOptions);
   }
 
   List<String> computeRuntimeArguments(
@@ -913,13 +929,12 @@
     if (_useEnableAsserts) {
       args.add('--enable_asserts');
     }
-    args
+    return args
       ..addAll(vmOptions)
       ..addAll(sharedOptions)
       ..addAll(_configuration.sharedOptions)
       ..addAll(_replaceDartFiles(originalArguments, artifact.filename))
       ..addAll(dartOptions);
-    return args;
   }
 }
 
@@ -1190,6 +1205,7 @@
   List<String> computeCompilerArguments(
       List<String> vmOptions,
       List<String> sharedOptions,
+      List<String> dartOptions,
       List<String> dart2jsOptions,
       List<String> ddcOptions,
       List<String> args) {

tools/testing/dart/test_suite.dart

diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index ba84c67..db2ceb1 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -821,14 +821,23 @@
     var commands = <Command>[];
     var compilerConfiguration = configuration.compilerConfiguration;
     var sharedOptions = info.optionsFromFile['sharedOptions'] as List<String>;
+    var dartOptions = info.optionsFromFile['dartOptions'] as List<String>;
     var dart2jsOptions = info.optionsFromFile['dart2jsOptions'] as List<String>;
     var ddcOptions = info.optionsFromFile['ddcOptions'] as List<String>;
 
+    var isMultitest = info.optionsFromFile["isMultitest"] as bool;
+    assert(!isMultitest || dartOptions.isEmpty);
+
     var compileTimeArguments = <String>[];
     String tempDir;
     if (compilerConfiguration.hasCompiler) {
       compileTimeArguments = compilerConfiguration.computeCompilerArguments(
-          vmOptions, sharedOptions, dart2jsOptions, ddcOptions, args);
+          vmOptions,
+          sharedOptions,
+          dartOptions,
+          dart2jsOptions,
+          ddcOptions,
+          args);
       // Avoid doing this for analyzer.
       var path = info.filePath;
       if (vmOptionsVariant != 0) {
@@ -862,10 +871,6 @@
       return commands;
     }
 
-    var isMultitest = info.optionsFromFile["isMultitest"] as bool;
-    var dartOptions = info.optionsFromFile['dartOptions'] as List<String>;
-    assert(!isMultitest || dartOptions.isEmpty);
-
     List<String> runtimeArguments =
         compilerConfiguration.computeRuntimeArguments(
             configuration.runtimeConfiguration,