Skip dxilconv tests when dxilconv.dll was not built. (#2750)

This commit is contained in:
Helena Kotas 2020-03-05 11:52:17 -08:00 коммит произвёл GitHub
Родитель ccd45ba40b
Коммит d7c339e989
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 11 добавлений и 1 удалений

Просмотреть файл

@ -176,6 +176,11 @@ if "%TEST_ALL%"=="1" (
set TEST_DXILCONV=1
)
if not exist %BIN_DIR%\dxilconv.dll (
echo Skipping dxilconv tests, dxilconv.dll not found.
set TEST_DXILCONV=0
)
where te.exe 1>nul 2>nul
if errorlevel 1 (
echo Unable to find te.exe on path.
@ -207,7 +212,12 @@ if "%TEST_CLEAN%"=="1" (
if not exist %TEST_DIR%\. (mkdir %TEST_DIR%)
echo Copying binaries to test to %TEST_DIR%:
call %HCT_DIR%\hctcopy.cmd %BIN_DIR% %TEST_DIR% dxa.exe dxc.exe dxexp.exe dxopt.exe dxr.exe dxv.exe clang-hlsl-tests.dll dxbc2dxil.exe dxilconv.dll dxilconv-tests.dll dxcompiler.dll d3dcompiler_dxc_bridge.dll dxl.exe dxc_batch.exe dxlib_sample.dll opt.exe
call %HCT_DIR%\hctcopy.cmd %BIN_DIR% %TEST_DIR% dxa.exe dxc.exe dxexp.exe dxopt.exe dxr.exe dxv.exe clang-hlsl-tests.dll dxcompiler.dll d3dcompiler_dxc_bridge.dll dxl.exe dxc_batch.exe dxlib_sample.dll
if errorlevel 1 exit /b 1
if "%TEST_DXILCONV%"=="1" (
call %HCT_DIR%\hctcopy.cmd %BIN_DIR% %TEST_DIR% dxbc2dxil.exe dxilconv.dll dxilconv-tests.dll opt.exe
)
if errorlevel 1 exit /b 1
rem Begin SPIRV change