Remove unnecessary flags for dart2js from test.dart
Change-Id: I751688fba97d605de69164068fe2377d80087127
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/96861
Commit-Queue: Sigmund Cherem <sigmund@google.com>
Reviewed-by: William Hesse <whesse@google.com>
diff --git a/pkg/front_end/testing.json b/pkg/front_end/testing.json
index 6dd8999..a1457fc 100644
--- a/pkg/front_end/testing.json
+++ b/pkg/front_end/testing.json
@@ -299,7 +299,7 @@
"mode": "release",
"common": "--dart2js-batch --time -pcolor --report -ax64 -mrelease --write-result-log",
"command-lines": [
- "-cdart2js -rd8 --use-sdk --minified --dart2js-with-kernel language language_2 dart2js_extra dart2js_native corelib corelib_2"
+ "-cdart2js -rd8 --use-sdk --minified language language_2 dart2js_extra dart2js_native corelib corelib_2"
]
},
diff --git a/pkg/smith/lib/configuration.dart b/pkg/smith/lib/configuration.dart
index 803ac2b..bfc1447 100644
--- a/pkg/smith/lib/configuration.dart
+++ b/pkg/smith/lib/configuration.dart
@@ -259,8 +259,6 @@
useAnalyzerCfe: boolOption("use-cfe"),
useAnalyzerFastaParser: boolOption("analyzer-use-fasta-parser"),
useBlobs: boolOption("use-blobs"),
- useDart2JSWithKernel: boolOption("dart2js-with-kernel"),
- useDart2JSOldFrontEnd: boolOption("dart2js-old-frontend"),
useHotReload: boolOption("hot-reload"),
useHotReloadRollback: boolOption("hot-reload-rollback"),
useSdk: boolOption("use-sdk"));
@@ -313,10 +311,6 @@
// TODO(rnystrom): What is this?
final bool useBlobs;
- // TODO(rnystrom): Remove these when Dart 1.0 is no longer supported.
- final bool useDart2JSWithKernel;
- final bool useDart2JSOldFrontEnd;
-
final bool useHotReload;
final bool useHotReloadRollback;
@@ -336,8 +330,6 @@
bool useAnalyzerCfe,
bool useAnalyzerFastaParser,
bool useBlobs,
- bool useDart2JSWithKernel,
- bool useDart2JSOldFrontEnd,
bool useHotReload,
bool useHotReloadRollback,
bool useSdk})
@@ -353,8 +345,6 @@
useAnalyzerCfe = useAnalyzerCfe ?? false,
useAnalyzerFastaParser = useAnalyzerFastaParser ?? false,
useBlobs = useBlobs ?? false,
- useDart2JSWithKernel = useDart2JSWithKernel ?? false,
- useDart2JSOldFrontEnd = useDart2JSOldFrontEnd ?? false,
useHotReload = useHotReload ?? false,
useHotReloadRollback = useHotReloadRollback ?? false,
useSdk = useSdk ?? false;
@@ -379,8 +369,6 @@
useAnalyzerCfe == other.useAnalyzerCfe &&
useAnalyzerFastaParser == other.useAnalyzerFastaParser &&
useBlobs == other.useBlobs &&
- useDart2JSWithKernel == other.useDart2JSWithKernel &&
- useDart2JSOldFrontEnd == other.useDart2JSOldFrontEnd &&
useHotReload == other.useHotReload &&
useHotReloadRollback == other.useHotReloadRollback &&
useSdk == other.useSdk;
@@ -411,8 +399,6 @@
useAnalyzerCfe,
useAnalyzerFastaParser,
useBlobs,
- useDart2JSWithKernel,
- useDart2JSOldFrontEnd,
useHotReload,
useHotReloadRollback,
useSdk
@@ -442,8 +428,6 @@
if (useAnalyzerCfe) fields.add("use-cfe");
if (useAnalyzerFastaParser) fields.add("analyzer-use-fasta-parser");
if (useBlobs) fields.add("use-blobs");
- if (useDart2JSWithKernel) fields.add("dart2js-with-kernel");
- if (useDart2JSOldFrontEnd) fields.add("dart2js-old-frontend");
if (useHotReload) fields.add("hot-reload");
if (useHotReloadRollback) fields.add("hot-reload-rollback");
if (useSdk) fields.add("use-sdk");
@@ -504,14 +488,6 @@
if (useBlobs || other.useBlobs) {
fields.add("useBlobs $useBlobs ${other.useBlobs}");
}
- if (useDart2JSWithKernel || other.useDart2JSWithKernel) {
- fields.add("useDart2JSWithKernel "
- "$useDart2JSWithKernel ${other.useDart2JSWithKernel}");
- }
- if (useDart2JSOldFrontEnd || other.useDart2JSOldFrontEnd) {
- fields.add("useDart2JSOldFrontEnd "
- "$useDart2JSOldFrontEnd ${other.useDart2JSOldFrontEnd}");
- }
if (useHotReload || other.useHotReload) {
fields.add("useHotReload $useHotReload ${other.useHotReload}");
}
diff --git a/pkg/smith/test/configuration_test.dart b/pkg/smith/test/configuration_test.dart
index 0952c72..86874b8 100644
--- a/pkg/smith/test/configuration_test.dart
+++ b/pkg/smith/test/configuration_test.dart
@@ -206,8 +206,6 @@
"host-checked": true,
"minified": true,
"preview-dart-2": true,
- "dart2js-with-kernel": true,
- "dart2js-old-frontend": true,
"hot-reload": true,
"hot-reload-rollback": true,
"use-sdk": true,
@@ -227,8 +225,6 @@
isHostChecked: true,
isMinified: true,
previewDart2: true,
- useDart2JSWithKernel: true,
- useDart2JSOldFrontEnd: true,
useHotReload: true,
useHotReloadRollback: true,
useSdk: true,
diff --git a/tools/gardening/bin/results_list.dart b/tools/gardening/bin/results_list.dart
index 2e9322c..e0baa1b 100644
--- a/tools/gardening/bin/results_list.dart
+++ b/tools/gardening/bin/results_list.dart
@@ -17,9 +17,6 @@
argParser.addOption("compiler", allowed: Compiler.names);
argParser.addFlag("csp", negatable: false);
argParser.addFlag("fasta", negatable: false);
- argParser.addFlag("dart2js-with-kernel", negatable: false);
- argParser.addFlag("dart2js-old-frontend", negatable: false);
- argParser.addFlag("dart2js-with-kernel-in-ssa", negatable: false);
argParser.addFlag("enable-asserts", negatable: false);
argParser.addFlag("fast-startup", negatable: false);
argParser.addFlag("host-checked", negatable: false);
@@ -54,8 +51,6 @@
argResults["builder-tag"],
argResults["fast-startup"],
0,
- argResults["dart2js-with-kernel"],
- argResults["dart2js-old-frontend"],
argResults["enable-asserts"],
argResults["hot-reload"],
argResults["hot-reload-rollback"],
diff --git a/tools/gardening/lib/src/results/configuration_environment.dart b/tools/gardening/lib/src/results/configuration_environment.dart
index 53da74d..9f35774 100644
--- a/tools/gardening/lib/src/results/configuration_environment.dart
+++ b/tools/gardening/lib/src/results/configuration_environment.dart
@@ -27,8 +27,6 @@
"checked": new _Variable.bool((c) => c.checked),
"compiler": new _Variable((c) => c.compiler, Compiler.names),
"csp": new _Variable.bool((c) => c.csp),
- "dart2js_with_kernel": new _Variable.bool((c) => c.dart2JsWithKernel),
- "dart2js_old_frontend": new _Variable.bool((c) => c.dart2JsOldFrontend),
"fasta": new _Variable.bool((c) => c.fasta),
"fast_startup": new _Variable.bool((c) => c.fastStartup),
"enable_asserts": new _Variable.bool((c) => c.enableAsserts),
diff --git a/tools/gardening/lib/src/results/result_json_models.dart b/tools/gardening/lib/src/results/result_json_models.dart
index 954b1c52..7a55a89 100644
--- a/tools/gardening/lib/src/results/result_json_models.dart
+++ b/tools/gardening/lib/src/results/result_json_models.dart
@@ -23,8 +23,6 @@
final String builderTag;
final bool fastStartup;
final int timeout;
- final bool dart2JsWithKernel;
- final bool dart2JsOldFrontend;
final bool enableAsserts;
final bool hotReload;
final bool hotReloadRollback;
@@ -48,8 +46,6 @@
this.builderTag,
this.fastStartup,
this.timeout,
- this.dart2JsWithKernel,
- this.dart2JsOldFrontend,
this.enableAsserts,
this.hotReload,
this.hotReloadRollback,
@@ -75,8 +71,6 @@
json["builder_tag"],
json["fast_startup"],
json["timeout"],
- json["dart2js_with_kernel"] ?? false,
- json["dart2js_old_frontend"] ?? false,
json["enable_asserts"] ?? false,
json["hot_reload"] ?? false,
json["hot_reload_rollback"] ?? false,
@@ -103,8 +97,6 @@
_boolToArg("use-sdk", useSdk),
_stringToArg("builder-tag", builderTag),
_boolToArg("fast-startup", fastStartup),
- _boolToArg("dart2js-with-kernel", dart2JsWithKernel),
- _boolToArg("dart2js-old-frontend", dart2JsOldFrontend),
_boolToArg("enable-asserts", enableAsserts),
_boolToArg("hot-reload", hotReload),
_boolToArg("hot-reload-rollback", hotReloadRollback),
@@ -119,7 +111,7 @@
String toCsvString() {
return "$mode;$arch;$compiler;$runtime;$checked;$strong;$hostChecked;"
"$minified;$csp;$fasta;$system;$vmOptions;$useSdk;$builderTag;$fastStartup;"
- "$dart2JsWithKernel;$dart2JsOldFrontend;$enableAsserts;$hotReload;"
+ "$enableAsserts;$hotReload;"
"$hotReloadRollback;$noPreviewDart2;$selectors";
}
diff --git a/tools/testing/dart/configuration.dart b/tools/testing/dart/configuration.dart
index 89ba917..c882c7a 100644
--- a/tools/testing/dart/configuration.dart
+++ b/tools/testing/dart/configuration.dart
@@ -117,8 +117,6 @@
bool get useBlobs => configuration.useBlobs;
bool get useSdk => configuration.useSdk;
bool get useEnableAsserts => configuration.enableAsserts;
- bool get useDart2JSWithKernel => configuration.useDart2JSWithKernel;
- bool get useDart2JSOldFrontend => configuration.useDart2JSOldFrontEnd;
// Various file paths.
@@ -187,9 +185,9 @@
Compiler.dartkb,
Compiler.dartkp,
Compiler.fasta,
+ Compiler.dart2js,
];
- return fastaCompilers.contains(compiler) ||
- (compiler == Compiler.dart2js && !useDart2JSOldFrontend);
+ return fastaCompilers.contains(compiler);
}
/// The base directory named for this configuration, like:
@@ -236,19 +234,12 @@
return const ["--ignore-unrecognized-flags"];
}
- var args = ['--generate-code-with-compile-time-errors', '--test-mode'];
+ var args = ['--test-mode'];
if (isChecked) args.add('--enable-checked-mode');
- if (!runtime.isBrowser) {
- args.add("--allow-mock-compilation");
- args.add("--categories=all");
- }
-
if (isMinified) args.add("--minify");
if (isCsp) args.add("--csp");
if (useEnableAsserts) args.add("--enable-asserts");
- if (useDart2JSWithKernel) args.add("--use-kernel");
- if (useDart2JSOldFrontend) args.add("--use-old-frontend");
return args;
}
@@ -453,8 +444,6 @@
'no_preview_dart_2': noPreviewDart2,
'use_cfe': useAnalyzerCfe,
'analyzer_use_fasta_parser': useAnalyzerFastaParser,
- 'dart2js_with_kernel': useDart2JSWithKernel,
- 'dart2js_old_frontend': useDart2JSOldFrontend,
'enable_asserts': useEnableAsserts,
'hot_reload': hotReload,
'hot_reload_rollback': hotReloadRollback,
diff --git a/tools/testing/dart/environment.dart b/tools/testing/dart/environment.dart
index 720c72d..5245977 100644
--- a/tools/testing/dart/environment.dart
+++ b/tools/testing/dart/environment.dart
@@ -21,8 +21,6 @@
"checked": new _Variable.bool((c) => c.isChecked),
"compiler": new _Variable((c) => c.compiler.name, Compiler.names),
"csp": new _Variable.bool((c) => c.isCsp),
- "dart2js_with_kernel": new _Variable.bool((c) => c.useDart2JSWithKernel),
- "dart2js_old_frontend": new _Variable.bool((c) => c.useDart2JSOldFrontend),
"enable_asserts": new _Variable.bool((c) => c.useEnableAsserts),
"fasta": new _Variable.bool((c) => c.usesFasta),
"host_checked": new _Variable.bool((c) => c.isHostChecked),
diff --git a/tools/testing/dart/options.dart b/tools/testing/dart/options.dart
index 564dbc8..ee60c72 100644
--- a/tools/testing/dart/options.dart
+++ b/tools/testing/dart/options.dart
@@ -174,13 +174,6 @@
'Pass the --use-fasta-parser flag to analyzer',
hide: true),
- // TODO(sigmund): replace dart2js_with_kernel with preview-dart-2.
- new _Option.bool(
- 'dart2js_with_kernel', 'Pass the --use-kernel flag to dart2js.',
- hide: true),
- new _Option.bool(
- 'dart2js_old_frontend', 'Pass the --use-old-frontend flag to dart2js.',
- hide: true),
new _Option.bool('hot_reload', 'Run hot reload stress tests.', hide: true),
new _Option.bool(
'hot_reload_rollback', 'Run hot reload rollback stress tests.',
@@ -695,8 +688,6 @@
data["analyzer_use_fasta_parser"] as bool,
useBlobs: data["use_blobs"] as bool,
useSdk: data["use_sdk"] as bool,
- useDart2JSWithKernel: data["dart2js_with_kernel"] as bool,
- useDart2JSOldFrontEnd: data["dart2js_old_frontend"] as bool,
useHotReload: data["hot_reload"] as bool,
useHotReloadRollback: data["hot_reload_rollback"] as bool,
isChecked: data["checked"] as bool,
