[tests] Ensure that --enable-asserts is used whereever checked was used previously
Change-Id: Ia88c03a8dd36237f3c819a3a892f8f17ecf7f00b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/97604
Commit-Queue: Alexander Aprelev <aam@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
diff --git a/pkg/front_end/tool/fasta b/pkg/front_end/tool/fasta
index 8118b1f..65b9ec4 100755
--- a/pkg/front_end/tool/fasta
+++ b/pkg/front_end/tool/fasta
@@ -62,4 +62,4 @@
shift
-exec "${DART_VM}" "${EXTRA_VM_ARGS[@]}" "${SCRIPT}" "$@"
+exec "${DART_VM}" "${EXTRA_VM_ARGS[@]}" --enable-asserts "${SCRIPT}" "$@"
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index bcf66e7..45806b7 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -304,7 +304,7 @@
"dartk-(linux|mac|win)-(debug|product|release)-(ia32|x64)": { },
"dartk-checked-(linux|mac|win)-(debug|product|release)-(ia32|x64)": {
"options": {
- "checked": true
+ "enable-asserts": true
}},
"dartk-(linux|mac|win)-(debug|product|release)-(arm64|simarm|simarm64|simdbc64)": { },
"dartk-optcounter-(linux|mac|win)-(debug|product|release)-(ia32|x64)": {
diff --git a/tools/testing/dart/compiler_configuration.dart b/tools/testing/dart/compiler_configuration.dart
index 5112daa..76bdb82 100644
--- a/tools/testing/dart/compiler_configuration.dart
+++ b/tools/testing/dart/compiler_configuration.dart
@@ -798,6 +798,9 @@
List<String> ddcOptions,
List<String> originalArguments) {
List<String> args = [];
+ if (_useEnableAsserts) {
+ args.add('--enable_asserts');
+ }
return args
..addAll(filterVmOptions(vmOptions))
..addAll(sharedOptions)
@@ -871,6 +874,9 @@
List<String> computeCompilerArguments(
vmOptions, sharedOptions, dart2jsOptions, ddcOptions, originalArguments) {
var args = <String>[];
+ if (_useEnableAsserts) {
+ args.add('--enable_asserts');
+ }
return args
..addAll(vmOptions)
..addAll(sharedOptions)