[fasta] Tweak fasta unit tests setup in anticipation of constant update 2018

mraleph · commit-bot@chromium.org · commit 09b93b7ea044 · 2019-07-11T19:59:59.000Z
- Pass empty environment defines into CompilerOptions - to ensure that there are no unevaluated constants in the output. VM does not expect those. - Include constant table when comparing expectations Change-Id: I276e8bf8ce1f4f39c63265e4ae2650953649e41f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108800 Auto-Submit: Vyacheslav Egorov <vegorov@google.com> Commit-Queue: Johnni Winther <johnniwinther@google.com> Reviewed-by: Johnni Winther <johnniwinther@google.com>
diff --git a/pkg/front_end/lib/src/fasta/testing/kernel_chain.dart b/pkg/front_end/lib/src/fasta/testing/kernel_chain.dart
@@ -230,6 +230,7 @@ class MatchExpectation extends Step<Component, Component, MatchContext> {
       printer.writeLibraryFile(library);
       printer.endLine();
     });
+    printer.writeConstantTable(component);
     String actual = "$buffer";
     String binariesPath = relativizeUri(platformBinariesLocation);
     if (binariesPath.endsWith("/dart-sdk/lib/_internal/")) {
diff --git a/pkg/front_end/test/fasta/testing/suite.dart b/pkg/front_end/test/fasta/testing/suite.dart
@@ -262,6 +262,7 @@ class FastaContext extends ChainContext with MatchContext {
           }
           ..sdkRoot = sdk
           ..packagesFileUri = packages
+          ..environmentDefines = {}
           ..experimentalFlags = <ExperimentalFlag, bool>{
             ExperimentalFlag.controlFlowCollections:
                 enableControlFlowCollections,
@@ -353,6 +354,7 @@ class Outline extends Step<TestDescription, Component, FastaContext> {
             }
             errors.writeAll(message.plainTextFormatted, "\n");
           }
+          ..environmentDefines = {}
           ..experimentalFlags = <ExperimentalFlag, bool>{
             ExperimentalFlag.controlFlowCollections:
                 context.enableControlFlowCollections,

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ class FastaContext extends ChainContext with MatchContext {`
`262`	`262`	`}`
`263`	`263`	`..sdkRoot = sdk`
`264`	`264`	`..packagesFileUri = packages`
	`265`	`+ ..environmentDefines = {}`
`265`	`266`	`..experimentalFlags = <ExperimentalFlag, bool>{`
`266`	`267`	`ExperimentalFlag.controlFlowCollections:`
`267`	`268`	`enableControlFlowCollections,`
`@@ -353,6 +354,7 @@ class Outline extends Step<TestDescription, Component, FastaContext> {`
`353`	`354`	`}`
`354`	`355`	`errors.writeAll(message.plainTextFormatted, "\n");`
`355`	`356`	`}`
	`357`	`+ ..environmentDefines = {}`
`356`	`358`	`..experimentalFlags = <ExperimentalFlag, bool>{`
`357`	`359`	`ExperimentalFlag.controlFlowCollections:`
`358`	`360`	`context.enableControlFlowCollections,`