@@ -36,6 +36,8 @@ set D3D11_ERROR=0
3636set D3D12_ERROR = 0
3737set GL_ERROR = 0
3838set VK_ERROR = 0
39+ set TOOLS_TEST_ERROR = 0
40+ set TOOLS_GPU_TEST_ERROR = 0
3941set APP_ERROR = 0
4042
4143set CURR_DIR = %cd%
@@ -56,6 +58,11 @@ cd "%CURR_DIR%\..\DiligentCore\Tests\DiligentCoreTest\assets"
5658set CORE_TEST_EXE_PATH = " %build_folder% \DiligentCore\Tests\DiligentCoreTest\%config% \DiligentCoreTest.exe"
5759(%CORE_TEST_EXE_PATH% ) || set /a CORE_TEST_ERROR = %CORE_TEST_ERROR%+ 1
5860
61+ cd " %CURR_DIR% \..\DiligentTools\Tests\DiligentToolsTest\assets"
62+ set TOOLS_TEST_EXE_PATH = " %build_folder% \DiligentTools\Tests\DiligentToolsTest\%config% \DiligentToolsTest.exe"
63+ (%TOOLS_TEST_EXE_PATH% ) || set /a TOOLS_TEST_ERROR = %TOOLS_TEST_ERROR%+ 1
64+
65+
5966cd " %CURR_DIR% \..\DiligentCore\Tests\DiligentCoreAPITest\assets"
6067set API_TEST_EXE_PATH = " %build_folder% \DiligentCore\Tests\DiligentCoreAPITest\%config% \DiligentCoreAPITest.exe"
6168
@@ -73,6 +80,18 @@ set API_TEST_EXE_PATH="%build_folder%\DiligentCore\Tests\DiligentCoreAPITest\%co
7380(%API_TEST_EXE_PATH% --mode=vk) || set /a VK_ERROR = %VK_ERROR%+ 1
7481(%API_TEST_EXE_PATH% --mode=vk --shader_compiler=dxc) || set /a VK_ERROR = %VK_ERROR%+ 10
7582
83+
84+ cd " %CURR_DIR% \..\DiligentTools\Tests\DiligentToolsGPUTest\assets"
85+ set TOOLS_GPU_TEST_EXE_PATH = " %build_folder% \DiligentTools\Tests\DiligentToolsGPUTest\%config% \DiligentToolsGPUTest.exe"
86+
87+ (%TOOLS_GPU_TEST_EXE_PATH% --mode=d3d11) || set /a TOOLS_GPU_TEST_ERROR = %TOOLS_GPU_TEST_ERROR%+ 1
88+ (%TOOLS_GPU_TEST_EXE_PATH% --mode=d3d11_sw) || set /a TOOLS_GPU_TEST_ERROR = %TOOLS_GPU_TEST_ERROR%+ 10
89+ (%TOOLS_GPU_TEST_EXE_PATH% --mode=d3d12) || set /a TOOLS_GPU_TEST_ERROR = %TOOLS_GPU_TEST_ERROR%+ 100
90+ (%TOOLS_GPU_TEST_EXE_PATH% --mode=d3d12_sw) || set /a TOOLS_GPU_TEST_ERROR = %TOOLS_GPU_TEST_ERROR%+ 1000
91+ (%TOOLS_GPU_TEST_EXE_PATH% --mode=gl) || set /a TOOLS_GPU_TEST_ERROR = %TOOLS_GPU_TEST_ERROR%+ 10000
92+ (%TOOLS_GPU_TEST_EXE_PATH% --mode=vk) || set /a TOOLS_GPU_TEST_ERROR = %TOOLS_GPU_TEST_ERROR%+ 100000
93+
94+
7695cd " %CURR_DIR% "
7796
7897echo .
@@ -86,12 +105,17 @@ set FONT_DEFAULT=[0m
86105
87106if " %FORMATTING_ERROR% " == " 0" (@ echo %FONT_GREEN% Format validation PASSED) else (@ echo %FONT_RED% Format validation FAILED with code %FORMATTING_ERROR% )
88107if " %CORE_TEST_ERROR% " == " 0" (@ echo %FONT_GREEN% Core tests PASSED) else (@ echo %FONT_RED% Core tests FAILED with code %CORE_TEST_ERROR% )
108+
89109if " %D3D11_ERROR% " == " 0" (@ echo %FONT_GREEN% D3D11 tests PASSED) else (@ echo %FONT_RED% D3D11 tests FAILED with code %D3D11_ERROR% )
90110if " %D3D12_ERROR% " == " 0" (@ echo %FONT_GREEN% D3D12 tests PASSED) else (@ echo %FONT_RED% D3D12 tests FAILED with code %D3D12_ERROR% )
91111if " %GL_ERROR% " == " 0" (@ echo %FONT_GREEN% GL tests PASSED) else (@ echo %FONT_RED% GL tests FAILED with code %GL_ERROR% )
92112if " %VK_ERROR% " == " 0" (@ echo %FONT_GREEN% Vk tests PASSED) else (@ echo %FONT_RED% Vk tests FAILED with code %VK_ERROR% )
113+
114+ if " %TOOLS_TEST_ERROR% " == " 0" (@ echo %FONT_GREEN% Tools tests PASSED) else (@ echo %FONT_RED% Tools tests FAILED with code %TOOLS_TEST_ERROR% )
115+ if " %TOOLS_GPU_TEST_ERROR% " == " 0" (@ echo %FONT_GREEN% Tools GPU tests PASSED) else (@ echo %FONT_RED% Tools GPU tests FAILED with code %TOOLS_GPU_TEST_ERROR% )
116+
93117if " %APP_ERROR% " == " 0" (@ echo %FONT_GREEN% Sample app tests PASSED) else (@ echo %FONT_RED% Sample app tests FAILED with code %APP_ERROR% )
94118
95119@ echo %FONT_DEFAULT%
96120
97- exit /B %D3D11_ERROR% +%D3D12_ERROR% +%GL_ERROR% +%VK_ERROR% +%APP_ERROR%
121+ exit /B %FORMATTING_ERROR% + %CORE_TEST_ERROR% + % D3D11_ERROR% +%D3D12_ERROR% +%GL_ERROR% +%VK_ERROR% + %TOOLS_TEST_ERROR% + %TOOLS_GPU_TEST_ERROR % +%APP_ERROR%
0 commit comments