Skip to content

Commit 43830ab

Browse files
alexmarkovCommit Queue
authored andcommitted
Test interpreter directly on the VM, without dynamic_module_runner
Also, run pkg/vm_service/ tests against interpreter. TEST=ci Change-Id: Ib9c7fc1ed33c5721288e3ba1a3d4999c3e234350 Cq-Include-Trybots: luci.dart.try:vm-aot-dyn-linux-debug-x64-try,vm-aot-dyn-linux-product-x64-try,vm-dyn-linux-debug-x64-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/436500 Reviewed-by: Slava Egorov <[email protected]> Commit-Queue: Alexander Markov <[email protected]>
1 parent 05c2f3b commit 43830ab

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

pkg/test_runner/lib/src/compiler_configuration.dart

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1666,15 +1666,14 @@ class BytecodeCompilerConfiguration extends CompilerConfiguration {
16661666
...testFile.sharedOptions,
16671667
..._configuration.sharedOptions,
16681668
..._experimentsArgument(_configuration, testFile),
1669-
..._replaceDartFiles(
1670-
originalArguments,
1671-
(_configuration.runtime == Runtime.dartPrecompiled)
1672-
? '${_configuration.buildDirectory}/dynamic_module_runner.snapshot'
1673-
: Platform.script
1674-
.resolve(
1675-
'../../../pkg/dynamic_modules/bin/dynamic_module_runner.dart')
1676-
.toFilePath()),
1677-
filename,
1669+
if (_configuration.runtime == Runtime.dartPrecompiled) ...[
1670+
..._replaceDartFiles(originalArguments,
1671+
'${_configuration.buildDirectory}/dynamic_module_runner.snapshot'),
1672+
filename,
1673+
] else ...[
1674+
'--interpreter',
1675+
...originalArguments,
1676+
],
16781677
...testFile.dartOptions
16791678
];
16801679
}

tools/bots/test_matrix.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,8 @@
13201320
"arguments": [
13211321
"-nvm-dyn-${system}-${mode}-${arch}",
13221322
"corelib",
1323-
"language"
1323+
"language",
1324+
"pkg/vm_service/"
13241325
],
13251326
"fileset": "vm",
13261327
"shards": 5

0 commit comments

Comments
 (0)