[infra] Allow arm64c on Android configurations
* Fail test.py if an invalid named configuration is used.
Cq-Include-Trybots: luci.dart.try:vm-ffi-android-product-arm64c-try
Change-Id: Ib700511a639ee39fd58441dd6fee8bd6dad8c2e5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/214040
Reviewed-by: William Hesse <whesse@google.com>
diff --git a/pkg/test_runner/lib/src/configuration.dart b/pkg/test_runner/lib/src/configuration.dart
index 12af614..bf842a4 100644
--- a/pkg/test_runner/lib/src/configuration.dart
+++ b/pkg/test_runner/lib/src/configuration.dart
@@ -412,9 +412,10 @@
architecture == Architecture.x64 ||
architecture == Architecture.arm ||
architecture == Architecture.arm_x64 ||
- architecture == Architecture.arm64)) {
+ architecture == Architecture.arm64 ||
+ architecture == Architecture.arm64c)) {
print("Warning: Android only supports the following "
- "architectures: ia32/x64/arm/arm64/arm_x64.");
+ "architectures: ia32/x64/arm/arm64/arm64c/arm_x64.");
isValid = false;
}
diff --git a/pkg/test_runner/lib/src/options.dart b/pkg/test_runner/lib/src/options.dart
index 3df3675..2989528 100644
--- a/pkg/test_runner/lib/src/options.dart
+++ b/pkg/test_runner/lib/src/options.dart
@@ -799,6 +799,8 @@
if (configuration.validate()) {
result.add(configuration);
+ } else if (namedConfiguration == null) {
+ _fail('The named configuration "$namedConfiguration" is invalid.');
}
}
