c89d87a512
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.
63 lines
2.5 KiB
Plaintext
63 lines
2.5 KiB
Plaintext
REQUIRES: system-windows, msvc
|
|
|
|
RUN: %build -n --verbose --arch=32 --compiler=msvc --mode=compile-and-link -o %t/foo.exe foobar.c \
|
|
RUN: | FileCheck --check-prefix=32BIT %s
|
|
|
|
RUN: %build -n --verbose --arch=64 --compiler=msvc --mode=compile-and-link -o %t/foo.exe foobar.c \
|
|
RUN: | FileCheck --check-prefix=64BIT %s
|
|
|
|
32BIT: Script Arguments:
|
|
32BIT: Arch: 32
|
|
32BIT: Compiler: msvc
|
|
32BIT: Outdir: {{.*}}
|
|
32BIT: Output: {{.*}}toolchain-msvc.test.tmp\foo.exe
|
|
32BIT: Nodefaultlib: False
|
|
32BIT: Opt: none
|
|
32BIT: Mode: compile
|
|
32BIT: Clean: True
|
|
32BIT: Verbose: True
|
|
32BIT: Dryrun: True
|
|
32BIT: Inputs: foobar.c
|
|
32BIT: Cleaning {{.*}}toolchain-msvc.test.tmp\foobar.ilk
|
|
32BIT: Cleaning {{.*}}toolchain-msvc.test.tmp\foo.exe-foobar.obj
|
|
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)|(arm64|ARM64))}}\{{(x86|arm)}}\cl.{{EXE|exe}}
|
|
32BIT: linking foo.exe-foobar.obj -> foo.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)|(arm64|ARM64))}}\{{(x86|x64|arm64)}}
|
|
|
|
|
|
64BIT: Script Arguments:
|
|
64BIT: Arch: 64
|
|
64BIT: Compiler: msvc
|
|
64BIT: Outdir: {{.*}}
|
|
64BIT: Output: {{.*}}toolchain-msvc.test.tmp\foo.exe
|
|
64BIT: Nodefaultlib: False
|
|
64BIT: Opt: none
|
|
64BIT: Mode: compile
|
|
64BIT: Clean: True
|
|
64BIT: Verbose: True
|
|
64BIT: Dryrun: True
|
|
64BIT: Inputs: foobar.c
|
|
64BIT: Cleaning {{.*}}toolchain-msvc.test.tmp\foobar.ilk
|
|
64BIT: Cleaning {{.*}}toolchain-msvc.test.tmp\foo.exe-foobar.obj
|
|
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)|(arm64|ARM64))}}\{{(x64|arm64)}}\cl.{{EXE|exe}}
|
|
64BIT: linking foo.exe-foobar.obj -> foo.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)|(arm64|ARM64))}}\{{(x86|x64|arm64)}}
|