[infra] allow to specify arch twice.

A recent change: https://dart-review.googlesource.com/c/sdk/+/333842
fixed a check in the test runner. The check fails when a flag
is provided to test.py but it is also implied by the configuration
name.

However, The web macos bots currently need to specify the arch flag,
even though it is implied by the named configuration. Without doing so
the sharding infrastructure seems to fail to assign the correct
architecture for the spawn bots.

This CL temporarily allows to continue specifying this flag to keep the
bots running. Ideally we should follow up with a infrastructure fix
to ensure this flag is not needed in the future.

This is being tracked in https://github.com/dart-lang/sdk/issues/53948

Change-Id: Ifba6a8924cbca9f3aca38933113abb168ff405d4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/333705
Reviewed-by: Nicholas Shahan <nshahan@google.com>
Commit-Queue: Sigmund Cherem <sigmund@google.com>
This commit is contained in:
Sigmund Cherem 2023-11-03 17:47:17 +00:00 committed by Commit Queue
parent 4bc730b18b
commit 2cb00aad5c

View file

@ -489,6 +489,11 @@ has been specified on the command line.''')
final namedConfigurations = options['named-configuration'];
if (namedConfigurations is List<String> && namedConfigurations.isNotEmpty) {
for (var optionName in _namedConfigurationOptions) {
// TODO(53948): Unfortuantely currently the test matrix needs to specify
// `arch` twice when using sharding in macos to prevent an
// infrastructure failure. When that's fixed we should be able to skip
// this line.
if (optionName == 'arch') continue;
if (results.wasParsed(optionName)) {
var namedConfigs =
(options['named-configuration'] as List<String>).join(', ');