From 355bb4287861f96082751042f4e58ff3598b4e5e Mon Sep 17 00:00:00 2001 From: Yong He Date: Fri, 1 Sep 2023 11:11:58 -0700 Subject: Fix github ci. (#3177) Co-authored-by: Yong He --- .github/workflows/windows.yml | 2 +- github_test.sh | 2 +- tests/expected-failure-github.txt | 1 + tests/expected-failure-linux.txt | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 tests/expected-failure-github.txt delete mode 100644 tests/expected-failure-linux.txt diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f3ac5fc04..182ac3867 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -66,5 +66,5 @@ jobs: $spirvToolsBinDir = ".\external\slang-binaries\spirv-tools\windows-${{matrix.testPlatform}}\bin\"; $env:Path += ";$slangTestBinDir;$spirvToolsBinDir"; Expand-Archive "vk_swiftshader_windows_${{matrix.testPlatform}}.zip" -DestinationPath $slangTestBinDir; - & "$slangTestBinDir\slang-test.exe" -api all-dx12 -appveyor -bindir "$slangTestBinDir\" -platform ${{matrix.testPlatform}} -configuration ${{matrix.configuration}} -category ${{matrix.testCategory}} 2>&1; + & "$slangTestBinDir\slang-test.exe" -api all-dx12 -appveyor -bindir "$slangTestBinDir\" -platform ${{matrix.testPlatform}} -configuration ${{matrix.configuration}} -category ${{matrix.testCategory}} -expected-failure-list tests/expected-failure-github.txt 2>&1; diff --git a/github_test.sh b/github_test.sh index f3c66e9b4..cb8dff723 100644 --- a/github_test.sh +++ b/github_test.sh @@ -38,4 +38,4 @@ SLANG_TEST=${OUTPUTDIR}slang-test export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OUTPUTDIR export PATH=$PATH:${OUTPUTDIR} -${SLANG_TEST} -bindir ${OUTPUTDIR} -travis -category ${SLANG_TEST_CATEGORY} ${SLANG_TEST_FLAGS} -api all-vk -expected-failure-list tests/expected-failure-linux.txt +${SLANG_TEST} -bindir ${OUTPUTDIR} -travis -category ${SLANG_TEST_CATEGORY} ${SLANG_TEST_FLAGS} -api all-vk -expected-failure-list tests/expected-failure-github.txt diff --git a/tests/expected-failure-github.txt b/tests/expected-failure-github.txt new file mode 100644 index 000000000..2c5295967 --- /dev/null +++ b/tests/expected-failure-github.txt @@ -0,0 +1 @@ +tests/cpu-program/gfx-smoke.slang (cpu) \ No newline at end of file diff --git a/tests/expected-failure-linux.txt b/tests/expected-failure-linux.txt deleted file mode 100644 index 2c5295967..000000000 --- a/tests/expected-failure-linux.txt +++ /dev/null @@ -1 +0,0 @@ -tests/cpu-program/gfx-smoke.slang (cpu) \ No newline at end of file -- cgit v1.2.3