languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-04 16:44:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Balance VM JIT and AOT shards.

Browse source 
Add test.py --default-suites that includes all the default suites in
addition to the ones explicitly requested, so the test matrix can run
co19 together with the default suites in one sharded test step.

Bug: b/290617138
Change-Id: I5dd5d1aaf3b1ee38adf88c6e9ee6ec13d97fe1ce
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/313567
Reviewed-by: William Hesse <whesse@google.com>
This commit is contained in:
Jonas Termansen 2023-07-14 16:01:09 +00:00
parent 4f8061da63
commit f9b8917e30
2 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/test_runner/lib/src/options.dart
View file

@ -370,6 +370,9 @@ options. Used to be able to make sane updates to the status files.''',
help: '''Transforms dart2js output with Babel. The value must be
Babel options JSON.''',
hide: true)
..addFlag('default-suites',
hide: true,
help: 'Include the default suites in addition to the requested suites.')
..addOption('suite-dir',
aliases: ['suite_dir'],
hide: true,
@ -402,6 +405,7 @@ has been specified on the command line.''')
'copy-coredumps',
'dart',
'debug-output-directory',
'default-suites',
'drt',
'exclude-suite',
'firefox',
@ -839,22 +843,20 @@ has been specified on the command line.''')
/// If no selectors are explicitly given, uses the default suite patterns.
Map<String, RegExp> _expandSelectors(
Map<String, dynamic> configuration, NnbdMode nnbdMode) {
var selectors = configuration['selectors'] as List<String>?;
var selectors = configuration['selectors'] as List<String>? ?? [];
if (selectors == null || selectors.isEmpty) {
if (selectors.isEmpty || configuration['default-suites'] as bool) {
if (configuration['suite-dir'] != null) {
var suitePath = Path(configuration['suite-dir'] as String);
selectors = [suitePath.filename];
selectors.add(suitePath.filename);
} else if (configuration['test-list-contents'] != null) {
selectors = (configuration['test-list-contents'] as List<String>)
.map((t) => t.split('/').first)
.toSet()
.toList();
selectors.addAll((configuration['test-list-contents'] as List<String>)
.map((t) => t.split('/').first));
} else {
if (nnbdMode == NnbdMode.legacy) {
selectors = _legacyTestSelectors.toList();
selectors.addAll(_legacyTestSelectors);
} else {
selectors = _defaultTestSelectors.toList();
selectors.addAll(_defaultTestSelectors);
}
}

22
tools/bots/test_matrix.json
View file

@ -1077,20 +1077,13 @@
},
{
"name": "vm tests",
"arguments": [
"-nvm-${system}-${mode}-${arch}"
],
"fileset": "vm",
"shards": 8
},
{
"name": "vm co19 tests",
"arguments": [
"-nvm-${system}-${mode}-${arch}",
"--default-suites",
"co19"
],
"fileset": "vm",
"shards": 8
"shards": 16
}
]
},
@ -1120,20 +1113,13 @@
},
{
"name": "vm tests",
"arguments": [
"-nvm-aot-${system}-${mode}-${arch}"
],
"fileset": "vm",
"shards": 8
},
{
"name": "vm co19 tests",
"arguments": [
"-nvm-aot-${system}-${mode}-${arch}",
"--default-suites",
"co19"
],
"fileset": "vm",
"shards": 12
"shards": 20
}
]
},