Index: pkg/kernel/test/closures/suite.dart |
diff --git a/pkg/kernel/test/closures/suite.dart b/pkg/kernel/test/closures/suite.dart |
index 6e246fac176b28f27ade41622041c5ab8fd0d1da..68851543764c9e08d923ce2a7b50473c09857300 100644 |
--- a/pkg/kernel/test/closures/suite.dart |
+++ b/pkg/kernel/test/closures/suite.dart |
@@ -4,6 +4,8 @@ |
library test.kernel.closures.suite; |
+import 'dart:io' show File; |
+ |
import 'dart:async' show Future; |
import 'package:front_end/physical_file_system.dart' show PhysicalFileSystem; |
@@ -11,16 +13,20 @@ import 'package:front_end/physical_file_system.dart' show PhysicalFileSystem; |
import 'package:kernel/core_types.dart' show CoreTypes; |
import 'package:testing/testing.dart' |
- show Chain, ChainContext, Result, Step, TestDescription, runMe; |
+ show |
+ Chain, |
+ ChainContext, |
+ Result, |
+ Step, |
+ TestDescription, |
+ runMe, |
+ StdioProcess; |
import 'package:front_end/src/fasta/testing/patched_sdk_location.dart' |
show computePatchedSdk; |
import 'package:kernel/ast.dart' show Program, Library; |
-import 'package:kernel/transformations/closure_conversion.dart' |
- as closure_conversion; |
- |
import 'package:front_end/src/fasta/testing/kernel_chain.dart' |
show Print, MatchExpectation, WriteDill, ReadDill, Verify; |
@@ -39,6 +45,9 @@ import 'package:front_end/src/fasta/testing/patched_sdk_location.dart'; |
import 'package:kernel/kernel.dart' show loadProgramFromBinary; |
+import 'package:kernel/transformations/closure_conversion.dart' |
+ as closure_conversion; |
+ |
import 'package:kernel/target/targets.dart' show TargetFlags; |
import 'package:kernel/target/vm_fasta.dart' show VmFastaTarget; |
@@ -46,43 +55,47 @@ import 'package:kernel/target/vm_fasta.dart' show VmFastaTarget; |
const String STRONG_MODE = " strong mode "; |
class ClosureConversionContext extends ChainContext { |
- final bool strongMode; |
- |
final TranslateUri uriTranslator; |
- |
final List<Step> steps; |
+ final Uri vm; |
ClosureConversionContext( |
- this.strongMode, bool updateExpectations, this.uriTranslator) |
+ this.vm, bool strongMode, bool updateExpectations, this.uriTranslator) |
: steps = <Step>[ |
- const FastaCompile(), |
+ new FastaCompile(strongMode), |
const Print(), |
const Verify(true), |
- const ClosureConversion(), |
+ const ConvertClosures(), |
const Print(), |
const Verify(true), |
new MatchExpectation(".expect", |
updateExpectations: updateExpectations), |
const WriteDill(), |
const ReadDill(), |
- // TODO(29143): add `Run` step when Vectors are added to VM. |
+ const Run(), |
]; |
- Future<Program> loadPlatform() async { |
- Uri sdk = await computePatchedSdk(); |
- return loadProgramFromBinary(sdk.resolve('platform.dill').toFilePath()); |
+ // The platform in these tests are reloaded for each testscase, because the |
+ // closure conversion transformation is performed during the load, and it's |
+ // not an idempotent transformation yet. |
+ Future<Program> loadPlatform() { |
+ return new Future<Program>(() async { |
+ Uri sdk = await computePatchedSdk(); |
+ return loadProgramFromBinary(sdk.resolve('platform.dill').toFilePath()); |
+ }); |
} |
static Future<ClosureConversionContext> create( |
Chain suite, Map<String, String> environment) async { |
Uri sdk = await computePatchedSdk(); |
+ Uri vm = computeDartVm(sdk); |
Uri packages = Uri.base.resolve(".packages"); |
bool strongMode = environment.containsKey(STRONG_MODE); |
bool updateExpectations = environment["updateExpectations"] == "true"; |
TranslateUri uriTranslator = await TranslateUri |
.parse(PhysicalFileSystem.instance, sdk, packages: packages); |
return new ClosureConversionContext( |
- strongMode, updateExpectations, uriTranslator); |
+ vm, strongMode, updateExpectations, uriTranslator); |
} |
} |
@@ -95,7 +108,9 @@ Future<ClosureConversionContext> createContext( |
class FastaCompile |
extends Step<TestDescription, Program, ClosureConversionContext> { |
- const FastaCompile(); |
+ final bool strongMode; |
+ |
+ const FastaCompile(this.strongMode); |
String get name => "fasta compilation"; |
@@ -104,7 +119,7 @@ class FastaCompile |
Program platform = await context.loadPlatform(); |
Ticker ticker = new Ticker(); |
DillTarget dillTarget = new DillTarget(ticker, context.uriTranslator, |
- new VmFastaTarget(new TargetFlags(strongMode: context.strongMode))); |
+ new VmFastaTarget(new TargetFlags(strongMode: this.strongMode))); |
platform.unbindCanonicalNames(); |
dillTarget.loader.appendLibraries(platform); |
KernelTarget sourceTarget = new KernelTarget( |
@@ -123,23 +138,41 @@ class FastaCompile |
} |
} |
-class ClosureConversion |
- extends Step<Program, Program, ClosureConversionContext> { |
- const ClosureConversion(); |
- |
+class ConvertClosures extends Step<Program, Program, ClosureConversionContext> { |
String get name => "closure conversion"; |
+ const ConvertClosures(); |
+ |
Future<Result<Program>> run( |
- Program program, ClosureConversionContext testContext) async { |
+ Program program, ClosureConversionContext context) async { |
try { |
CoreTypes coreTypes = new CoreTypes(program); |
Library library = program.libraries |
.firstWhere((Library library) => library.importUri.scheme != "dart"); |
closure_conversion.transformLibraries(coreTypes, <Library>[library]); |
- return pass(program); |
} catch (e, s) { |
return crash(e, s); |
} |
+ return pass(program); |
+ } |
+} |
+ |
+class Run extends Step<Uri, int, ClosureConversionContext> { |
+ const Run(); |
+ |
+ String get name => "run"; |
+ |
+ Future<Result<int>> run(Uri uri, ClosureConversionContext context) async { |
+ File generated = new File.fromUri(uri); |
+ StdioProcess process; |
+ try { |
+ process = |
+ await StdioProcess.run(context.vm.toFilePath(), [generated.path]); |
+ print(process.output); |
+ } finally { |
+ generated.parent.delete(recursive: true); |
+ } |
+ return process.toResult(); |
} |
} |