diff options
| author | Yong He <yonghe@outlook.com> | 2023-09-01 11:11:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-01 11:11:58 -0700 |
| commit | 355bb4287861f96082751042f4e58ff3598b4e5e (patch) | |
| tree | b0412ba11c6dc88a7d129c4f6165fd02e8e8cb1f | |
| parent | d1f7e406e895f77d1d02615edd568cd2535957b4 (diff) | |
Fix github ci. (#3177)
Co-authored-by: Yong He <yhe@nvidia.com>
| -rw-r--r-- | .github/workflows/windows.yml | 2 | ||||
| -rw-r--r-- | github_test.sh | 2 | ||||
| -rw-r--r-- | tests/expected-failure-github.txt (renamed from tests/expected-failure-linux.txt) | 0 |
3 files changed, 2 insertions, 2 deletions
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-linux.txt b/tests/expected-failure-github.txt index 2c5295967..2c5295967 100644 --- a/tests/expected-failure-linux.txt +++ b/tests/expected-failure-github.txt |