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 --- tests/cpu-program/cpu-hello-world-test.slang | 7 +++++++ tests/cpu-program/cpu-hello-world-test.slang.expected | 6 ++++++ tests/cpu-program/cpu-hello-world.slang | 7 ------- tests/cpu-program/cpu-hello-world.slang.expected | 6 ------ tests/expected-failure-github-runner.txt | 1 - tests/expected-failure-no-gpu.txt | 6 ++++++ tests/expected-failure-via-glsl.txt | 7 +++++++ tests/expected-failure.txt | 7 ------- 8 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 tests/cpu-program/cpu-hello-world-test.slang create mode 100644 tests/cpu-program/cpu-hello-world-test.slang.expected delete mode 100644 tests/cpu-program/cpu-hello-world.slang delete mode 100644 tests/cpu-program/cpu-hello-world.slang.expected delete mode 100644 tests/expected-failure-github-runner.txt create mode 100644 tests/expected-failure-no-gpu.txt create mode 100644 tests/expected-failure-via-glsl.txt delete mode 100644 tests/expected-failure.txt (limited to 'tests') diff --git a/tests/cpu-program/cpu-hello-world-test.slang b/tests/cpu-program/cpu-hello-world-test.slang new file mode 100644 index 000000000..a44761e8f --- /dev/null +++ b/tests/cpu-program/cpu-hello-world-test.slang @@ -0,0 +1,7 @@ +//TEST:EXECUTABLE: + +export __extern_cpp int main() +{ + printf("Hello World.\n"); + return 0; +} diff --git a/tests/cpu-program/cpu-hello-world-test.slang.expected b/tests/cpu-program/cpu-hello-world-test.slang.expected new file mode 100644 index 000000000..81531657f --- /dev/null +++ b/tests/cpu-program/cpu-hello-world-test.slang.expected @@ -0,0 +1,6 @@ +result code = 0 +standard error = { +} +standard output = { +Hello World. +} diff --git a/tests/cpu-program/cpu-hello-world.slang b/tests/cpu-program/cpu-hello-world.slang deleted file mode 100644 index a44761e8f..000000000 --- a/tests/cpu-program/cpu-hello-world.slang +++ /dev/null @@ -1,7 +0,0 @@ -//TEST:EXECUTABLE: - -export __extern_cpp int main() -{ - printf("Hello World.\n"); - return 0; -} diff --git a/tests/cpu-program/cpu-hello-world.slang.expected b/tests/cpu-program/cpu-hello-world.slang.expected deleted file mode 100644 index 81531657f..000000000 --- a/tests/cpu-program/cpu-hello-world.slang.expected +++ /dev/null @@ -1,6 +0,0 @@ -result code = 0 -standard error = { -} -standard output = { -Hello World. -} diff --git a/tests/expected-failure-github-runner.txt b/tests/expected-failure-github-runner.txt deleted file mode 100644 index 1da3a9669..000000000 --- a/tests/expected-failure-github-runner.txt +++ /dev/null @@ -1 +0,0 @@ -slang-unit-test-tool/cudaCodeGenBug.internal diff --git a/tests/expected-failure-no-gpu.txt b/tests/expected-failure-no-gpu.txt new file mode 100644 index 000000000..93c5394f7 --- /dev/null +++ b/tests/expected-failure-no-gpu.txt @@ -0,0 +1,6 @@ +slang-unit-test-tool/RecordReplay_triangle.internal +slang-unit-test-tool/RecordReplay_ray_tracing.internal +slang-unit-test-tool/RecordReplay_ray_tracing_pipeline.internal +slang-unit-test-tool/RecordReplay_autodiff_texture.internal +slang-unit-test-tool/RecordReplay_gpu_printing.internal +slang-unit-test-tool/cudaCodeGenBug.internal diff --git a/tests/expected-failure-via-glsl.txt b/tests/expected-failure-via-glsl.txt new file mode 100644 index 000000000..7283c8d97 --- /dev/null +++ b/tests/expected-failure-via-glsl.txt @@ -0,0 +1,7 @@ +tests/language-feature/saturated-cooperation/simple.slang (vk) +tests/language-feature/saturated-cooperation/fuse3.slang (vk) +tests/language-feature/saturated-cooperation/fuse-product.slang (vk) +tests/language-feature/saturated-cooperation/fuse.slang (vk) +tests/bugs/byte-address-buffer-interlocked-add-f32.slang (vk) +tests/ir/loop-unroll-0.slang.1 (vk) +tests/hlsl-intrinsic/texture/float-atomics.slang (vk) diff --git a/tests/expected-failure.txt b/tests/expected-failure.txt deleted file mode 100644 index 7283c8d97..000000000 --- a/tests/expected-failure.txt +++ /dev/null @@ -1,7 +0,0 @@ -tests/language-feature/saturated-cooperation/simple.slang (vk) -tests/language-feature/saturated-cooperation/fuse3.slang (vk) -tests/language-feature/saturated-cooperation/fuse-product.slang (vk) -tests/language-feature/saturated-cooperation/fuse.slang (vk) -tests/bugs/byte-address-buffer-interlocked-add-f32.slang (vk) -tests/ir/loop-unroll-0.slang.1 (vk) -tests/hlsl-intrinsic/texture/float-atomics.slang (vk) -- cgit v1.2.3