From 3cbc500118d27f82c89f401ffb34826264e9cb60 Mon Sep 17 00:00:00 2001 From: Jay Kwak <82421531+jkwak-work@users.noreply.github.com> Date: Wed, 18 Jun 2025 16:38:39 -0700 Subject: Fix retry logic for unit test (#7471) * Fix the ignored unit-tests on retry * Retrigger CI * Add more error messages * Don't use test-server for retry of unit-test to see error messages * Clean up cl.yml Remove 'has-gpu' because it is unused after debug became full-gpu-test. Renamed files to make the meaning more clear: - Renamed expected-failure.txt to expected-failure-via-glsl.txt - Renamed expected-failure-github-runner.txt to expected-failure-no-gpu.txt * Rename cpu-hello-world.slang to avoid name conflict to example We have an example whose executable name is cpu-hello-world.exe. It gets built when you run `cmake --build`, but it gets overwritten by slang-test when it tests `tests/cpu-program/cpu-hello-world.slang`. This PR renames to avoid the name conflict. * Remove debug code --------- Co-authored-by: Yong He --- .github/workflows/ci.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to '.github') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ac310510..52008e28f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,7 @@ jobs: platform: x86_64 test-category: full full-gpu-tests: true - runs-on: [Windows, self-hosted, "GCP-T4"] + runs-on: [Windows, self-hosted, GCP-T4] has-gpu: true server-count: 8 fail-fast: false @@ -231,23 +231,12 @@ jobs: -skip-reference-image-generation \ -show-adapter-info \ -enable-debug-layers false - elif [[ "${{matrix.has-gpu}}" == "true" ]]; then - "$bin_dir/slang-test" \ - -use-test-server \ - -category ${{ matrix.test-category }} \ - -api all-dx12 \ - -expected-failure-list tests/expected-failure-github.txt \ - -expected-failure-list tests/expected-failure-github-runner.txt \ - -skip-reference-image-generation \ - -show-adapter-info \ - -enable-debug-layers false else "$bin_dir/slang-test" \ -use-test-server \ -category ${{ matrix.test-category }} \ - -api all-dx12 \ -expected-failure-list tests/expected-failure-github.txt \ - -expected-failure-list tests/expected-failure-github-runner.txt \ + -expected-failure-list tests/expected-failure-no-gpu.txt \ -skip-reference-image-generation \ -show-adapter-info \ -enable-debug-layers false @@ -276,7 +265,7 @@ jobs: -category ${{ matrix.test-category }} \ -emit-spirv-via-glsl \ -api vk \ - -expected-failure-list tests/expected-failure.txt \ + -expected-failure-list tests/expected-failure-via-glsl.txt \ -skip-reference-image-generation \ -show-adapter-info - name: Run slang-rhi tests -- cgit v1.2.3