llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: None (joaosaffran) <details> <summary>Changes</summary> Running those test in WSL seem to be generating a different file extension, `obj` instead of `dxo`, to fix that I am allowing the test to pass with both files --- Full diff: https://github.com/llvm/llvm-project/pull/161566.diff 2 Files Affected: - (modified) clang/test/Driver/dxc_frs.hlsl (+1-1) - (modified) clang/test/Driver/dxc_rootsignature_target.hlsl (+1-1) ``````````diff diff --git a/clang/test/Driver/dxc_frs.hlsl b/clang/test/Driver/dxc_frs.hlsl index 767cab604c829..b3b685b10f01f 100644 --- a/clang/test/Driver/dxc_frs.hlsl +++ b/clang/test/Driver/dxc_frs.hlsl @@ -3,7 +3,7 @@ // Test to demonstrate extracting the root signature to the specified // output file with /Frs. -// CHECK: "{{.*}}llvm-objcopy{{(.exe)?}}" "{{.*}}.obj" "{{.*}}.dxo" "--extract-section=RTS0={{.*}}.rs.dxo" +// CHECK: "{{.*}}llvm-objcopy{{(.exe)?}}" "{{.*}}.obj" "{{.*}}.{{(dxo|obj)}}" "--extract-section=RTS0={{.*}}.rs.dxo" [shader("compute"), RootSignature("")] [numthreads(1,1,1)] diff --git a/clang/test/Driver/dxc_rootsignature_target.hlsl b/clang/test/Driver/dxc_rootsignature_target.hlsl index 08cd1ab00089b..784523707746d 100644 --- a/clang/test/Driver/dxc_rootsignature_target.hlsl +++ b/clang/test/Driver/dxc_rootsignature_target.hlsl @@ -3,6 +3,6 @@ // CMDS: "{{.*}}clang{{.*}}" "-cc1" // CMDS-SAME: "-triple" "dxilv1.1-unknown-shadermodel1.1-rootsignature" // CMDS-SAME: "-hlsl-entry" "EntryRS" -// CMDS: "{{.*}}llvm-objcopy{{(.exe)?}}" "{{.*}}.dxo" "--only-section=RTS0" +// CMDS: "{{.*}}llvm-objcopy{{(.exe)?}}" "{{.*}}.{{(dxo|obj)}}" "--only-section=RTS0" #define EntryRS "UAV(u0)" `````````` </details> https://github.com/llvm/llvm-project/pull/161566 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
