[infra] Add --no-preview-dart-2 support for the analyzer to test.py

https://github.com/dart-lang/sdk/issues/32609

Change-Id: I5a7009a55a26452eae6e6465aeb78cecab91b476
Reviewed-on: https://dart-review.googlesource.com/50725
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Alexander Thomas 2018-04-11 15:16:36 +00:00 committed by commit-bot@chromium.org
parent 4126459025
commit a60d803913
7 changed files with 18 additions and 2 deletions

View file

@ -27,11 +27,12 @@ void addStandardArguments(ArgParser argParser) {
argParser.addFlag("hot-reload-rollback", negatable: false);
argParser.addFlag("minified", negatable: false);
argParser.addOption("mode", allowed: Mode.names);
argParser.addFlag("no-preview-dart-2", negatable: false);
argParser.addFlag("preview-dart-2", negatable: false);
argParser.addOption("runtime", allowed: Runtime.names);
argParser.addFlag("strong", negatable: false);
argParser.addOption("system", allowed: System.names);
argParser.addFlag("use-sdk", negatable: false);
argParser.addFlag("preview-dart-2", negatable: false);
}
/// Helper function to get a configuration from [argResults].
@ -58,6 +59,7 @@ models.Configuration getConfigurationFromArguments(ArgResults argResults) {
argResults["enable-asserts"],
argResults["hot-reload"],
argResults["hot-reload-rollback"],
argResults["no-preview-dart-2"],
argResults["preview-dart-2"],
argResults.rest);
}

View file

@ -46,6 +46,7 @@ final _variables = {
}),
"minified": new _Variable.bool((c) => c.minified),
"mode": new _Variable((c) => c.mode, Mode.names),
"no_preview_dart_2": new _Variable.bool((c) => c.noPreviewDart2),
"preview_dart_2": new _Variable.bool((c) => c.previewDart2),
"runtime": new _Variable(_runtimeName, Runtime.names),
"spec_parser": new _Variable.bool((c) => c.compiler == Compiler.specParser),

View file

@ -28,6 +28,7 @@ class Configuration {
final bool enableAsserts;
final bool hotReload;
final bool hotReloadRollback;
final bool noPreviewDart2;
final bool previewDart2;
final List<String> selectors;
@ -53,6 +54,7 @@ class Configuration {
this.enableAsserts,
this.hotReload,
this.hotReloadRollback,
this.noPreviewDart2,
this.previewDart2,
this.selectors);
@ -79,6 +81,7 @@ class Configuration {
json["enable_asserts"] ?? false,
json["hot_reload"] ?? false,
json["hot_reload_rollback"] ?? false,
json["no_preview_dart_2"] ?? false,
json["preview_dart_2"] ?? false,
json["selectors"] ?? []);
}
@ -107,6 +110,7 @@ class Configuration {
_boolToArg("enable-asserts", enableAsserts),
_boolToArg("hot-reload", hotReload),
_boolToArg("hot-reload-rollback", hotReloadRollback),
_boolToArg("no-preview-dart-2", noPreviewDart2),
_boolToArg("preview-dart-2", previewDart2)
].where((x) => x != null).toList();
if (includeSelectors && selectors != null && selectors.length > 0) {
@ -119,7 +123,7 @@ class Configuration {
return "$mode;$arch;$compiler;$runtime;$checked;$strong;$hostChecked;"
"$minified;$csp;$fasta;$system;$vmOptions;$useSdk;$builderTag;$fastStartup;"
"$dart2JsWithKernel;$dart2JsOldFrontend;$enableAsserts;$hotReload;"
"$hotReloadRollback;$previewDart2;$selectors";
"$hotReloadRollback;$noPreviewDart2;$previewDart2;$selectors";
}
String _stringToArg(String name, String value) {

View file

@ -40,6 +40,7 @@ class Configuration {
this.isVerbose,
this.listTests,
this.listStatusFiles,
this.noPreviewDart2,
this.previewDart2,
this.printTiming,
this.printReport,
@ -114,6 +115,7 @@ class Configuration {
final bool isVerbose;
final bool listTests;
final bool listStatusFiles;
final bool noPreviewDart2;
final bool previewDart2;
final bool printTiming;
final bool printReport;
@ -474,6 +476,7 @@ class Configuration {
'builder_tag': builderTag,
'fast_startup': useFastStartup,
'timeout': timeout,
'no_preview_dart_2': noPreviewDart2,
'preview_dart_2': previewDart2,
'dart2js_with_kernel': useDart2JSWithKernel,
'dart2js_old_frontend': useDart2JSOldFrontend,

View file

@ -32,6 +32,7 @@ final _variables = {
"jscl": new _Variable.bool((c) => c.runtime.isJSCommandLine),
"minified": new _Variable.bool((c) => c.isMinified),
"mode": new _Variable((c) => c.mode.name, Mode.names),
"no_preview_dart_2": new _Variable.bool((c) => c.noPreviewDart2),
"preview_dart_2": new _Variable.bool((c) => c.previewDart2),
"runtime": new _Variable(_runtimeName, Runtime.names),
"spec_parser": new _Variable.bool((c) => c.compiler == Compiler.specParser),

View file

@ -166,6 +166,9 @@ simdbc, simdbc64''',
'Only run tests that are not marked `Slow` or `Timeout`.'),
new _Option.bool('enable_asserts',
'Pass the --enable-asserts flag to dart2js or to the vm.'),
new _Option.bool(
'no-preview_dart_2', 'Pass the --no-preview-dart-2 flag to analyzer.',
hide: true),
new _Option.bool(
'preview_dart_2', 'Pass the --preview-dart-2 flag to analyzer.',
hide: true),
@ -641,6 +644,7 @@ compiler.''',
isVerbose: data["verbose"] as bool,
listTests: data["list"] as bool,
listStatusFiles: data["list_status_files"] as bool,
noPreviewDart2: data["no-preview_dart_2"] as bool,
previewDart2: data["preview_dart_2"] as bool,
printTiming: data["time"] as bool,
printReport: data["report"] as bool,

View file

@ -1325,6 +1325,7 @@ class StandardTestSuite extends TestSuite {
args.add('--format=machine');
args.add('--no-hints');
if (configuration.previewDart2) args.add("--preview-dart-2");
if (configuration.noPreviewDart2) args.add("--no-preview-dart-2");
if (filePath.filename.contains("dart2js") ||
filePath.directoryPath.segments().last.contains('html_common')) {