Skip to content

Commit 051b05c

Browse files
authored
[lit] fall back to taef for taef only test options (#5404)
It is not easy to pass through the quoted /p options thru python. And these options are mainly for local debug filter, not for taef FileCheck tests. Just fall back to taef for these options and treat them like taef helper. This is help to allow lit FileCheck shell test.
1 parent 15c8723 commit 051b05c

1 file changed

Lines changed: 17 additions & 0 deletions

File tree

utils/hct/hcttest.cmd

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ if "%1"=="-clean" (
9393
) else if "%1"=="clang-filter" (
9494
set TEST_ALL=0
9595
set TEST_CLANG=1
96+
set TEST_USE_LIT=0
97+
echo Fallback to taef when use taef only options.
9698
set TEST_CLANG_FILTER=%2
9799
shift /1
98100
) else if "%1"=="file-check" (
@@ -103,6 +105,8 @@ if "%1"=="-clean" (
103105
) else if "%1"=="v" (
104106
set TEST_ALL=0
105107
set TEST_CLANG=1
108+
set TEST_USE_LIT=0
109+
echo Fallback to taef when use taef only options.
106110
set TEST_CLANG_FILTER=VerifierTest::*
107111
) else if "%1"=="cmd" (
108112
set TEST_ALL=0
@@ -113,7 +117,9 @@ if "%1"=="-clean" (
113117
) else if "%1" == "dxilconv-filter" (
114118
set TEST_ALL=0
115119
set TEST_DXILCONV=1
120+
set TEST_USE_LIT=0
116121
set TEST_DXILCONV_FILTER=%2
122+
echo Fallback to taef when use taef only options.
117123
shift /1
118124
) else if "%1"=="noexec" (
119125
set TEST_ALL=0
@@ -129,17 +135,23 @@ if "%1"=="-clean" (
129135
) else if "%1"=="exec-filter" (
130136
set TEST_ALL=0
131137
set TEST_EXEC=1
138+
set TEST_USE_LIT=0
139+
echo Fallback to taef when use taef only options.
132140
set TEST_EXEC_FILTER=ExecutionTest::%2
133141
set TEST_EXEC_REQUIRED=1
134142
shift /1
135143
) else if "%1"=="exec-future" (
136144
set TEST_ALL=0
137145
set TEST_EXEC=1
146+
set TEST_USE_LIT=0
147+
echo Fallback to taef when use taef only options.
138148
set TEST_EXEC_FUTURE=1
139149
set TEST_EXEC_REQUIRED=1
140150
) else if "%1"=="exec-future-filter" (
141151
set TEST_ALL=0
142152
set TEST_EXEC=1
153+
set TEST_USE_LIT=0
154+
echo Fallback to taef when use taef only options.
143155
set TEST_EXEC_FUTURE=1
144156
set TEST_EXEC_FILTER=ExecutionTest::%2
145157
set TEST_EXEC_REQUIRED=1
@@ -171,6 +183,7 @@ if "%1"=="-clean" (
171183
) else if /i "%1"=="-arm64ec" (
172184
set BUILD_ARCH=ARM64EC
173185
) else if "%1"=="-adapter" (
186+
set TEST_USE_LIT=0
174187
set TEST_ADAPTER= /p:"Adapter=%~2"
175188
shift /1
176189
) else if "%1"=="-verbose" (
@@ -184,6 +197,8 @@ if "%1"=="-clean" (
184197
shift /1
185198
) else if "%1"=="-file-check-dump" (
186199
set ADDITIONAL_OPTS=%ADDITIONAL_OPTS% /p:"FileCheckDumpDir=%~2\HLSL"
200+
set TEST_USE_LIT=0
201+
echo Fallback to taef when use taef only options.
187202
shift /1
188203
) else if "%1"=="-dxil-loc" (
189204
set DXIL_DLL_LOC=%~2
@@ -204,6 +219,8 @@ rem This is the robust way to detect whether %1 is empty:
204219
set "_NEXT_=%1"
205220
if not defined _NEXT_ goto :done_args
206221
set ADDITIONAL_OPTS=%ADDITIONAL_OPTS% %1
222+
set TEST_USE_LIT=0
223+
echo Fallback to taef when use taef only options.
207224
shift /1
208225
goto :collect_args
209226
:done_args

0 commit comments

Comments
 (0)