Remove Test-Clang option to simplify and work around cmake/actions

disconnect

Author: llvm-beanz

.github/workflows/macos-clang-mtl.yaml

@@ -15,6 +15,5 @@ jobs:
     with:
       OS: macOS
       SKU: macos
-      Test-Clang: On
       TestTarget: check-hlsl-clang-mtl
       OffloadTest-branch: ${{ github.ref }}

.github/workflows/macos-dxc-mtl.yaml

@@ -15,6 +15,5 @@ jobs:
     with:
       OS: macOS
       SKU: macos
-      Test-Clang: Off
       TestTarget: check-hlsl-mtl
       OffloadTest-branch: ${{ github.ref }}

.github/workflows/pr-matrix.yaml

@@ -26,7 +26,6 @@ jobs:
       OS: windows
       SKU: ${{ matrix.SKU }}
       TestTarget: ${{ matrix.TestTarget }}
-      Test-Clang: ${{ contains(matrix.TestTarget, 'clang') }}
       OffloadTest-branch: ${{ github.event.pull_request.head.sha }}
       LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On
 
@@ -42,5 +41,4 @@ jobs:
       OS: macOS
       SKU: ${{ matrix.SKU }}
       TestTarget: ${{ matrix.TestTarget }}
-      Test-Clang: ${{ contains('clang', matrix.TestTarget) }}
       OffloadTest-branch: ${{ github.event.pull_request.head.sha }}

.github/workflows/test-all.yaml

@@ -40,12 +40,6 @@ on:
         required: false
         default: 'check-hlsl'
         type: string
-      Test-Clang:
-        required: true
-        type: choice
-        options:
-        - On
-        - Off
       OS:
         required: true
         type: choice
@@ -97,10 +91,6 @@ on:
         required: false
         default: 'Release'
         type: string
-      Test-Clang:
-        required: false
-        default: 'On'
-        type: string
       TestTarget:
         required: false
         default: 'check-hlsl'
@@ -156,12 +146,20 @@ jobs:
             cd build
             cmake -G Ninja -DCMAKE_BUILD_TYPE=${{ inputs.BuildType }} -C ${{ github.workspace }}/DXC/cmake/caches/PredefinedParams.cmake -C ${{ github.workspace }}/OffloadTest/cmake/caches/sccache.cmake -DHLSL_DISABLE_SOURCE_GENERATION=On ${{ github.workspace }}/DXC/
             ninja
+      - name: Should Test Clang!
+        if: ${{ contains('clang', inputs.TestTarget) }}
+        env:
+          TEST_CLANG: On
+      - name: Should NOT Test Clang!
+        if: ${{ !contains('clang', inputs.TestTarget) }}
+        env:
+          TEST_CLANG: Off
       - name: Build LLVM
         run: |
             cd llvm-project
             mkdir build
             cd build
-            cmake -G Ninja ${{ inputs.LLVM-ExtraCMakeArgs }} -DCMAKE_BUILD_TYPE=${{ inputs.BuildType }} -C ${{ github.workspace }}/llvm-project/clang/cmake/caches/HLSL.cmake -C ${{ github.workspace }}/OffloadTest/cmake/caches/sccache.cmake -DDXC_DIR=${{ github.workspace }}/DXC/build/bin -DLLVM_EXTERNAL_OFFLOADTEST_SOURCE_DIR=${{ github.workspace }}/OffloadTest -DLLVM_EXTERNAL_PROJECTS="OffloadTest" -DLLVM_LIT_ARGS="--xunit-xml-output=testresults.xunit.xml -v" -DOFFLOADTEST_TEST_CLANG=${{ inputs.Test-Clang }} -DGOLDENIMAGE_DIR=${{ github.workspace }}/golden-images ${{ github.workspace }}/llvm-project/llvm/
+            cmake -G Ninja ${{ inputs.LLVM-ExtraCMakeArgs }} -DCMAKE_BUILD_TYPE=${{ inputs.BuildType }} -C ${{ github.workspace }}/llvm-project/clang/cmake/caches/HLSL.cmake -C ${{ github.workspace }}/OffloadTest/cmake/caches/sccache.cmake -DDXC_DIR=${{ github.workspace }}/DXC/build/bin -DLLVM_EXTERNAL_OFFLOADTEST_SOURCE_DIR=${{ github.workspace }}/OffloadTest -DLLVM_EXTERNAL_PROJECTS="OffloadTest" -DLLVM_LIT_ARGS="--xunit-xml-output=testresults.xunit.xml -v" -DOFFLOADTEST_TEST_CLANG=$(TEST_CLANG) -DGOLDENIMAGE_DIR=${{ github.workspace }}/golden-images ${{ github.workspace }}/llvm-project/llvm/
             ninja hlsl-test-depends
       - name: Run HLSL Tests
         run: |

.github/workflows/windows-intel-clang-d3d12.yaml

@@ -15,7 +15,6 @@ jobs:
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: On
       TestTarget: check-hlsl-clang-d3d12
       OffloadTest-branch: ${{ github.ref }}
       LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On

.github/workflows/windows-intel-clang-vk.yaml

@@ -15,7 +15,6 @@ jobs:
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: On
       TestTarget: check-hlsl-clang-vk
       OffloadTest-branch: ${{ github.ref }}
       LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On

.github/workflows/windows-intel-clang-warp-d3d12.yaml

@@ -15,7 +15,6 @@ jobs:
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: On
       TestTarget: check-hlsl-clang-warp-d3d12
       OffloadTest-branch: ${{ github.ref }}
       LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On

.github/workflows/windows-intel-dxc-d3d12.yaml

@@ -15,7 +15,6 @@ jobs:
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: Off
       BuildType: Debug
       TestTarget: check-hlsl-d3d12
       OffloadTest-branch: ${{ github.ref }}

.github/workflows/windows-intel-dxc-vk.yaml

@@ -15,7 +15,6 @@ jobs:
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: Off
       BuildType: Debug
       TestTarget: check-hlsl-vk
       OffloadTest-branch: ${{ github.ref }}

.github/workflows/windows-intel-dxc-warp-d3d12.yaml

@@ -15,7 +15,6 @@ jobs:
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: Off
       BuildType: Debug
       TestTarget: check-hlsl-warp-d3d12
       OffloadTest-branch: ${{ github.ref }}