[clang] 7f88c71 - [clang][NFC] Test msvc multilib resource dirs (#238210)

via cfe-commits cfe-commits at lists.llvm.org
Tue Nov 3 20:00:05 PST 2026


Author: Sam Elliott
Date: 2026-11-03T20:00:00-08:00
New Revision: 7f88c71773a9ed4bbb6860e862b18183bf6fdb58

URL: https://github.com/llvm/llvm-project/commit/7f88c71773a9ed4bbb6860e862b18183bf6fdb58
DIFF: https://github.com/llvm/llvm-project/commit/7f88c71773a9ed4bbb6860e862b18183bf6fdb58.diff

LOG: [clang][NFC] Test msvc multilib resource dirs (#238210)

As with other similar tests, explicitly add checks for the resource dir
paths added by the driver when using multilibs.

Assisted-by: AI

Added: 
    clang/test/Driver/Inputs/multilib_msvc_tree/resource/include/.keep
    clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/clang_rt.builtins.lib
    clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/debug/clang_rt.builtins.lib
    clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/noexcept/clang_rt.builtins.lib

Modified: 
    clang/test/Driver/msvc-multilib.yaml

Removed: 
    


################################################################################
diff  --git a/clang/test/Driver/Inputs/multilib_msvc_tree/resource/include/.keep b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/include/.keep
new file mode 100644
index 00000000000000..e69de29bb2d1d6

diff  --git a/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/clang_rt.builtins.lib b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/clang_rt.builtins.lib
new file mode 100644
index 00000000000000..cc68999e800ec9
--- /dev/null
+++ b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/clang_rt.builtins.lib
@@ -0,0 +1 @@
+Fixture used to verify MSVC multilib compiler-rt lookup.

diff  --git a/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/debug/clang_rt.builtins.lib b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/debug/clang_rt.builtins.lib
new file mode 100644
index 00000000000000..cc68999e800ec9
--- /dev/null
+++ b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/debug/clang_rt.builtins.lib
@@ -0,0 +1 @@
+Fixture used to verify MSVC multilib compiler-rt lookup.

diff  --git a/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/noexcept/clang_rt.builtins.lib b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/noexcept/clang_rt.builtins.lib
new file mode 100644
index 00000000000000..cc68999e800ec9
--- /dev/null
+++ b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/noexcept/clang_rt.builtins.lib
@@ -0,0 +1 @@
+Fixture used to verify MSVC multilib compiler-rt lookup.

diff  --git a/clang/test/Driver/msvc-multilib.yaml b/clang/test/Driver/msvc-multilib.yaml
index b650393003fd0e..358bc5bbfc93fe 100644
--- a/clang/test/Driver/msvc-multilib.yaml
+++ b/clang/test/Driver/msvc-multilib.yaml
@@ -2,30 +2,41 @@
 # RUN: %clang --multi-lib-config=%s -no-canonical-prefixes -x c %s -### -o /dev/null 2>&1 \
 # RUN:     --target=x86_64-pc-windows-msvc -fmultilib-flag=debug \
 # RUN:     -ccc-install-dir %S/Inputs/multilib_msvc_tree/bin \
+# RUN:     -resource-dir=%S/Inputs/multilib_msvc_tree/resource \
 # RUN:   | FileCheck --check-prefix=CHECK-DEBUG %s
 # CHECK-DEBUG:      "-cc1" "-triple" "x86_64-pc-windows-msvc
+# CHECK-DEBUG:      "-resource-dir" "{{.*}}multilib_msvc_tree{{[/\\]}}resource"
+# CHECK-DEBUG-SAME: "-internal-isystem" "{{.*}}multilib_msvc_tree{{[/\\]+}}resource{{[/\\]+}}include"
 # CHECK-DEBUG:      "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/debug"
+# CHECK-DEBUG:      "-libpath:{{.*}}multilib_msvc_tree{{[/\\]+}}resource{{[/\\]+}}lib{{[/\\]+}}x86_64-pc-windows-msvc{{[/\\]+}}debug"
 # CHECK-DEBUG:      "-libpath:{{[^"]*}}/debug"
 
 # Default behavior where no variant path is prepended.
 # RUN: %clang --multi-lib-config=%s -no-canonical-prefixes -x c %s -### -o /dev/null 2>&1 \
 # RUN:     --target=x86_64-pc-windows-msvc \
 # RUN:     -ccc-install-dir %S/Inputs/multilib_msvc_tree/bin \
+# RUN:     -resource-dir=%S/Inputs/multilib_msvc_tree/resource \
 # RUN:   | FileCheck --check-prefix=CHECK-DEFAULT %s
-# CHECK-DEFAULT-NOT: "-libpath:{{[^"]*}}/debug"
-# CHECK-DEFAULT-NOT: "-libpath:{{[^"]*}}/release"
-# CHECK-DEFAULT-NOT: "-libpath:{{[^"]*}}/noexcept"
+# CHECK-DEFAULT:     "-internal-isystem" "{{.*}}multilib_msvc_tree{{[/\\]+}}resource{{[/\\]+}}include"
 # CHECK-DEFAULT-NOT: "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/debug"
 # CHECK-DEFAULT-NOT: "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/release"
 # CHECK-DEFAULT-NOT: "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/noexcept"
+# CHECK-DEFAULT:     "-libpath:{{.*}}multilib_msvc_tree{{[/\\]+}}resource{{[/\\]+}}lib{{[/\\]+}}x86_64-pc-windows-msvc"
+# CHECK-DEFAULT-NOT: "-libpath:{{[^"]*}}/debug"
+# CHECK-DEFAULT-NOT: "-libpath:{{[^"]*}}/release"
+# CHECK-DEFAULT-NOT: "-libpath:{{[^"]*}}/noexcept"
 
 # Multiple matches stacking on top of each-other.
 # RUN: %clang --multi-lib-config=%s -no-canonical-prefixes -x c %s -### -o /dev/null 2>&1 \
 # RUN:     --target=x86_64-pc-windows-msvc -fmultilib-flag=debug -fno-exceptions \
 # RUN:     -ccc-install-dir %S/Inputs/multilib_msvc_tree/bin \
+# RUN:     -resource-dir=%S/Inputs/multilib_msvc_tree/resource \
 # RUN:   | FileCheck --check-prefix=CHECK-LAYERED %s
+# CHECK-LAYERED:      "-internal-isystem" "{{.*}}multilib_msvc_tree{{[/\\]+}}resource{{[/\\]+}}include"
 # CHECK-LAYERED:      "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/noexcept"
 # CHECK-LAYERED-SAME: "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/debug"
+# CHECK-LAYERED:      "-libpath:{{.*}}multilib_msvc_tree{{[/\\]+}}resource{{[/\\]+}}lib{{[/\\]+}}x86_64-pc-windows-msvc{{[/\\]+}}noexcept"
+# CHECK-LAYERED-SAME: "-libpath:{{.*}}multilib_msvc_tree{{[/\\]+}}resource{{[/\\]+}}lib{{[/\\]+}}x86_64-pc-windows-msvc{{[/\\]+}}debug"
 # CHECK-LAYERED:      "-libpath:{{[^"]*}}/noexcept"
 # CHECK-LAYERED-SAME: "-libpath:{{[^"]*}}/debug"
 


        


More information about the cfe-commits mailing list