[lldb][test] Fix toolchain-msvc.test for native ARM64 MSVC environment #171797
+6
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch fixes toolchain-msvc.test on Windows ARM64 hosts running under native ARM64 environment via vcvarsarm64.bat. Our lab buildbot recently switched from using cross vcvarsamd64_arm64.bat environment to native vcvarsarm64.bat. This patch updates FileCheck patterns to also allow HostARM64 and arm64 PATH entries. Changes: -> Extend host regex to match HostARM64 (case-insensitive). -> Allow arm64 in PATH tail. -> Apply same fix in both 32-bit and 64-bit sections.
Member
|
@llvm/pr-subscribers-lldb Author: Omair Javaid (omjavaid) ChangesThis patch fixes toolchain-msvc.test on Windows ARM64 hosts running under native ARM64 environment via vcvarsarm64.bat. Our lab buildbot recently switched from using cross vcvarsamd64_arm64.bat environment to native vcvarsarm64.bat. This patch updates FileCheck patterns to also allow HostARM64 and arm64 PATH entries. Changes: Full diff: https://github.com/llvm/llvm-project/pull/171797.diff 1 Files Affected:
diff --git a/lldb/test/Shell/BuildScript/toolchain-msvc.test b/lldb/test/Shell/BuildScript/toolchain-msvc.test
index dce87d5aee2af..bde895fa6dbaf 100644
--- a/lldb/test/Shell/BuildScript/toolchain-msvc.test
+++ b/lldb/test/Shell/BuildScript/toolchain-msvc.test
@@ -23,15 +23,15 @@ RUN: | FileCheck --check-prefix=64BIT %s
32BIT: Cleaning {{.*}}toolchain-msvc.test.tmp\foo.pdb
32BIT: Cleaning {{.*}}toolchain-msvc.test.tmp\foo.exe
32BIT: compiling foobar.c -> foo.exe-foobar.obj
-32BIT: Command Line: {{.*}}\{{[Hh]ost[Xx](64|86)}}\{{(x86|arm)}}\cl.{{EXE|exe}}
+32BIT: Command Line: {{.*}}\{{[Hh]ost([Xx](64|86)|(arm64|ARM64))}}\{{(x86|arm)}}\cl.{{EXE|exe}}
32BIT: linking foo.exe-foobar.obj -> foo.exe
-32BIT: Command Line: {{.*}}\{{[Hh]ost[Xx](64|86)}}\{{(x86|arm)}}\link.{{EXE|exe}}
+32BIT: Command Line: {{.*}}\{{[Hh]ost([Xx](64|86)|(arm64|ARM64))}}\{{(x86|arm)}}\link.{{EXE|exe}}
32BIT: Env
32BIT: LIB = {{.*}}\ATLMFC\lib\{{(x86|arm)}}
32BIT: {{.*}}\lib\{{(x86|arm)}}
32BIT: {{.*}}\ucrt\{{(x86|arm)}}
32BIT: {{.*}}\um\{{(x86|arm)}}
-32BIT: PATH = {{.*}}\bin\{{[Hh]ost[Xx](64|86)}}\{{(x86|x64)}}
+32BIT: PATH = {{.*}}\bin\{{[Hh]ost([Xx](64|86)|(arm64|ARM64))}}\{{(x86|x64|arm64)}}
64BIT: Script Arguments:
@@ -51,12 +51,12 @@ RUN: | FileCheck --check-prefix=64BIT %s
64BIT: Cleaning {{.*}}toolchain-msvc.test.tmp\foo.pdb
64BIT: Cleaning {{.*}}toolchain-msvc.test.tmp\foo.exe
64BIT: compiling foobar.c -> foo.exe-foobar.obj
-64BIT: Command Line: {{.*}}\{{[Hh]ost[Xx](64|86)}}\{{(x64|arm64)}}\cl.{{EXE|exe}}
+64BIT: Command Line: {{.*}}\{{[Hh]ost([Xx](64|86)|(arm64|ARM64))}}\{{(x64|arm64)}}\cl.{{EXE|exe}}
64BIT: linking foo.exe-foobar.obj -> foo.exe
-64BIT: Command Line: {{.*}}\{{[Hh]ost[Xx](64|86)}}\{{(x64|arm64)}}\link.{{EXE|exe}}
+64BIT: Command Line: {{.*}}\{{[Hh]ost([Xx](64|86)|(arm64|ARM64))}}\{{(x64|arm64)}}\link.{{EXE|exe}}
64BIT: Env
64BIT: LIB = {{.*}}\ATLMFC\lib\{{(x64|arm64)}}
64BIT: {{.*}}\lib\{{(x64|arm64)}}
64BIT: {{.*}}\ucrt\{{(x64|arm64)}}
64BIT: {{.*}}\um\{{(x64|arm64)}}
-64BIT: PATH = {{.*}}\bin\{{[Hh]ost[Xx](64|86)}}\{{(x86|x64)}}
+64BIT: PATH = {{.*}}\bin\{{[Hh]ost([Xx](64|86)|(arm64|ARM64))}}\{{(x86|x64|arm64)}}
|
DavidSpickett
approved these changes
Dec 11, 2025
Collaborator
DavidSpickett
left a comment
DavidSpickett
left a comment
There was a problem hiding this comment.
Confused as to where we expect to get ARM64 vs. arm64 but assuming it's just how Microsoft chose to name things, this LGTM.
DavidSpickett
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch fixes toolchain-msvc.test on Windows ARM64 hosts running under native ARM64 environment via vcvarsarm64.bat. Our lab buildbot recently switched from using cross vcvarsamd64_arm64.bat environment to native vcvarsarm64.bat. This patch updates FileCheck patterns to also allow HostARM64 and arm64 PATH entries.
Changes:
-> Extend host regex to match HostARM64 (case-insensitive)
-> Allow arm64 in PATH tail.
-> Apply same fix in both 32-bit and 64-bit sections.