From 831d79654996b3d1e9af3ca0cc580f71997eb346 Mon Sep 17 00:00:00 2001
From: Jay Kwak <82421531+jkwak-work@users.noreply.github.com>
Date: Thu, 18 Jul 2024 16:28:08 -0700
Subject: Separating slang-test in CI for emit-spirv-via-glsl (#4665)

* Separating slang-test in CI for emit-spirv-via-glsl

When CI test fails, we expect to see the error messages at the end of
each section of CI testing result. But currently when
"emit-spirv-via-glsl" fails, the error messages appear in the middle,
which lead us to believe that there is no errors when you look only at
the end of the result.

This commit separates out the "emit-spirv-via-glsl" case to make the
error message more visiable.
---
 .github/workflows/ci.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a45d7647c..0949abcb7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -105,31 +105,31 @@ jobs:
         run: |
           export SLANG_RUN_SPIRV_VALIDATION=1
           export SLANG_USE_SPV_SOURCE_LANGUAGE_UNKNOWN=1
-          failed=0
           if [[ "${{matrix.full-gpu-tests}}" == "true" ]]; then
             "$bin_dir/slang-test" \
               -use-test-server \
               -server-count 8 \
               -category ${{ matrix.test-category }} \
-              -api all-cpu ||
-              failed=1
-            "$bin_dir/slang-test" \
-              -use-test-server \
-              -server-count 8 \
-              -emit-spirv-via-glsl \
-              -api vk \
-              -category ${{ matrix.test-category }} \
-              -expected-failure-list tests/expected-failure.txt ||
-              failed=1
+              -api all-cpu
           else
             "$bin_dir/slang-test" \
               -use-test-server \
-              -api all-dx12 \
               -category ${{ matrix.test-category }} \
-              -expected-failure-list tests/expected-failure-github.txt ||
-              failed=1
+              -api all-dx12 \
+              -expected-failure-list tests/expected-failure-github.txt
           fi
-          exit $failed
+      - name: Test Slang via glsl
+        if: ${{matrix.full-gpu-tests}}
+        run: |
+          export SLANG_RUN_SPIRV_VALIDATION=1
+          export SLANG_USE_SPV_SOURCE_LANGUAGE_UNKNOWN=1
+          "$bin_dir/slang-test" \
+            -use-test-server \
+            -server-count 8 \
+            -category ${{ matrix.test-category }} \
+            -emit-spirv-via-glsl \
+            -api vk \
+            -expected-failure-list tests/expected-failure.txt
       - uses: actions/upload-artifact@v3
         if: ${{ ! matrix.full-gpu-tests }}
         with:
-- 
cgit v1.2.3