Skip to content

Map Win32 to x86 for TAEF #4513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hekota merged 1 commit into from
Jun 15, 2022
+11 −7
Merged

Map Win32 to x86 for TAEF #4513

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions utils/hct/hcttest.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,10 @@ rem Win32 to x86, ARM64EC to ARM64, no changes for other platforms
set BUILD_ARCH_DIR=%BUILD_ARCH:Win32=x86%
set BUILD_ARCH_DIR=%BUILD_ARCH_DIR:ARM64EC=ARM64%

rem Map build arch to test arch (for TAEF)
rem Win32 to x86, no changes for other platforms
set TEST_ARCH=%BUILD_ARCH:Win32=x86%

rem By default, run all clang tests and execution tests and dxilconv tests
if "%TEST_ALL%"=="1" (
set TEST_CLANG=1
Expand Down Expand Up @@ -309,9 +313,9 @@ if exist "%HCT_EXTRAS%\hcttest-before.cmd" (
if "%TEST_CLANG%"=="1" (
echo Running Clang unit tests ...
if "%TEST_CLANG_FILTER%"=="" (
set SELECT_FILTER= /select:"@Priority<1 AND @Architecture='%BUILD_ARCH%'"
set SELECT_FILTER= /select:"@Priority<1 AND @Architecture='%TEST_ARCH%'"
) else (
set SELECT_FILTER= /select:"@Name='%TEST_CLANG_FILTER%' AND @Architecture='%BUILD_ARCH%'"
set SELECT_FILTER= /select:"@Name='%TEST_CLANG_FILTER%' AND @Architecture='%TEST_ARCH%'"
)

call :runte clang-hlsl-tests.dll /p:"HlslDataDir=%HLSL_SRC_DIR%\tools\clang\test\HLSL" !SELECT_FILTER! %ADDITIONAL_OPTS%
Expand All @@ -331,7 +335,7 @@ if "%TEST_EXEC%"=="1" (
set EXEC_COMMON_ARGS= /p:"HlslDataDir=%HLSL_SRC_DIR%\tools\clang\test\HLSL" /runIgnoredTests /p:"ExperimentalShaders=*" %TEST_ADAPTER% %USE_AGILITY_SDK%
if "%TEST_EXEC%"=="1" (
echo Sniffing for D3D12 configuration ...
call :runte clang-hlsl-tests.dll /select:"@Name='ExecutionTest::BasicTriangleTest' AND @Architecture='%BUILD_ARCH%'" %EXEC_COMMON_ARGS%
call :runte clang-hlsl-tests.dll /select:"@Name='ExecutionTest::BasicTriangleTest' AND @Architecture='%TEST_ARCH%'" %EXEC_COMMON_ARGS%
set RES_EXEC=!ERRORLEVEL!
if errorlevel 1 (
if not "%TEST_EXEC_REQUIRED%"=="1" (
Expand All @@ -346,9 +350,9 @@ if "%TEST_EXEC%"=="1" (

if "%TEST_EXEC%"=="1" (
if "%TEST_EXEC_FUTURE%"=="1" (
set SELECT_FILTER= /select:"@Name='%TEST_EXEC_FILTER%' AND @Priority=2 AND @Architecture='%BUILD_ARCH%'"
set SELECT_FILTER= /select:"@Name='%TEST_EXEC_FILTER%' AND @Priority=2 AND @Architecture='%TEST_ARCH%'"
) else (
set SELECT_FILTER= /select:"@Name='%TEST_EXEC_FILTER%' AND @Priority<2 AND @Architecture='%BUILD_ARCH%'"
set SELECT_FILTER= /select:"@Name='%TEST_EXEC_FILTER%' AND @Priority<2 AND @Architecture='%TEST_ARCH%'"
)
call :runte clang-hlsl-tests.dll !SELECT_FILTER! %EXEC_COMMON_ARGS% %ADDITIONAL_OPTS%
set RES_EXEC=!ERRORLEVEL!
Expand All @@ -364,9 +368,9 @@ if exist "%HCT_EXTRAS%\hcttest-extras.cmd" (

if "%TEST_DXILCONV%"=="1" (
if "%TEST_DXILCONV_FILTER%"=="" (
set SELECT_FILTER= /select:"@Architecture='%BUILD_ARCH%'"
set SELECT_FILTER= /select:"@Architecture='%TEST_ARCH%'"
) else (
set SELECT_FILTER= /select:"@Name='%TEST_DXILCONV_FILTER%' AND @Architecture='%BUILD_ARCH%'"
set SELECT_FILTER= /select:"@Name='%TEST_DXILCONV_FILTER%' AND @Architecture='%TEST_ARCH%'"
)
call :runte dxilconv-tests.dll /p:"HlslDataDir=%HLSL_SRC_DIR%\projects\dxilconv\test" !SELECT_FILTER!
set RES_DXILCONV=!ERRORLEVEL!
Expand Down