From 1600519f81b331ee8d2fa5edaec347b3ca4db1fb Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Fri, 4 Apr 2025 13:24:38 -0700 Subject: [PATCH] [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 Reviewed-by: Siva Annamalai --- pkg/test_runner/lib/src/test_case.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/test_runner/lib/src/test_case.dart b/pkg/test_runner/lib/src/test_case.dart index 945141c1889..1633e1a98c9 100644 --- a/pkg/test_runner/lib/src/test_case.dart +++ b/pkg/test_runner/lib/src/test_case.dart @@ -266,11 +266,12 @@ class RunningProcess { command.executable.contains("SIMARM64") || command.executable.contains("SIMARM64C") || command.executable.contains("SIMRISCV64"); + var isARM64 = !isX64 && command.executable.contains("ARM64"); if (configuration.windowsSdkPath != null) { executable = [ configuration.windowsSdkPath!, 'Debuggers', - if (isX64) 'x64' else 'x86', + if (isX64) 'x64' else if (isARM64) 'arm64' else 'x86', 'cdb.exe', ].join('\\'); diagnostics.add("Using $executable to print stack traces");