From 4db2bbe94deacc8e83eeb3dcef6180234cbd6f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20von=20der=20Ahe=CC=81?= <ahe@google.com>
Date: Wed, 10 Oct 2018 13:38:57 +0000
Subject: [PATCH] Pass SharedOptions to Fasta
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Idf85bf49e0ddd47640719eb65044f0b6527f9d9c
Reviewed-on: https://dart-review.googlesource.com/c/78525
Commit-Queue: Peter von der Ahé <ahe@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 tools/testing/dart/compiler_configuration.dart | 2 +-
 tools/testing/dart/test_suite.dart             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/testing/dart/compiler_configuration.dart b/tools/testing/dart/compiler_configuration.dart
index 1ca96e7e322..5cce89d5e5d 100644
--- a/tools/testing/dart/compiler_configuration.dart
+++ b/tools/testing/dart/compiler_configuration.dart
@@ -1163,7 +1163,7 @@ class FastaCompilerConfiguration extends CompilerConfiguration {
       List<String> dart2jsOptions,
       List<String> ddcOptions,
       List<String> args) {
-    List<String> arguments = <String>[];
+    List<String> arguments = new List<String>.from(sharedOptions);
     for (String argument in args) {
       if (argument == "--ignore-unrecognized-flags") continue;
       arguments.add(argument);
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index 3cd18ab2447..0428eff632c 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -1184,6 +1184,10 @@ class StandardTestSuite extends TestSuite {
     assert(!isMultitest || dartOptions == null);
     args.add(filePath.toNativePath());
     if (dartOptions != null) {
+      // TODO(ahe): Because we add [dartOptions] here,
+      // [CompilerConfiguration.computeCompilerArguments] has to discard them
+      // later. Perhaps it would be simpler to pass [dartOptions] to
+      // [CompilerConfiguration.computeRuntimeArguments].
       args.addAll(dartOptions);
     }