Skip to content

Commit 1600519

Browse files
aamCommit Queue
authored andcommitted
[test/win] Use correct cdb.exe on ARM64.
See https://dart-ci.appspot.com/log/vm-win-release-arm64/vm-win-release-arm64/3854/vm/cc/IsolateReload_RegressB179030011 for example of currently incorrect behavior where x86 is used instead of arm64. TEST=ci Change-Id: I8e725a1bca39dcdd67ea856b7ebbea24e750dfda Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/420501 Commit-Queue: Alexander Aprelev <[email protected]> Reviewed-by: Siva Annamalai <[email protected]>
1 parent 6c5c9d3 commit 1600519

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

pkg/test_runner/lib/src/test_case.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,12 @@ class RunningProcess {
266266
command.executable.contains("SIMARM64") ||
267267
command.executable.contains("SIMARM64C") ||
268268
command.executable.contains("SIMRISCV64");
269+
var isARM64 = !isX64 && command.executable.contains("ARM64");
269270
if (configuration.windowsSdkPath != null) {
270271
executable = [
271272
configuration.windowsSdkPath!,
272273
'Debuggers',
273-
if (isX64) 'x64' else 'x86',
274+
if (isX64) 'x64' else if (isARM64) 'arm64' else 'x86',
274275
'cdb.exe',
275276
].join('\\');
276277
diagnostics.add("Using $executable to print stack traces");

0 commit comments

Comments
 (0)