@@ -146,6 +146,15 @@ if not defined CLRTestExecutionArguments (set CLRTestExecutionArguments=$(CLRTes
146
146
]]> </BatchCLRTestArgPrep >
147
147
148
148
<!-- By default, be prepared to do a full check -->
149
+ <BatchLoopPart2 Condition =" '$(CLRTestLoop)' == 'true'" ><![CDATA[ SET /A RetryCount=%RetryCount%-1
150
+ IF NOT "%RetryCount%"=="0" (
151
+ GOTO :RetryingRerun
152
+ ) ELSE (
153
+ ECHO END EXECUTION - PASSED BUT ALSO FAILED
154
+ ECHO FAILED
155
+ popd
156
+ Exit /b 1
157
+ )]]> </BatchLoopPart2 >
149
158
<BatchCLRTestExitCodeCheck ><![CDATA[
150
159
ECHO Expected: %CLRTestExpectedExitCode%
151
160
ECHO Actual: %CLRTestExitCode%
@@ -157,6 +166,7 @@ IF NOT "%CLRTestExitCode%"=="%CLRTestExpectedExitCode%" (
157
166
) ELSE (
158
167
ECHO END EXECUTION - PASSED
159
168
ECHO PASSED
169
+ $(BatchLoopPart2)
160
170
popd
161
171
Exit /b 0
162
172
)
@@ -305,6 +315,8 @@ REM Local CoreShim requested - see MSBuild property 'CLRTestScriptLocalCoreShim'
305
315
ECHO Copying '%CORE_ROOT%\CoreShim.dll'...
306
316
COPY /y %CORE_ROOT%\CoreShim.dll .
307
317
]]> </BatchCopyCoreShimLocalCmds >
318
+ <BatchLoopPart1 Condition =" '$(CLRTestLoop)' == 'true'" ><![CDATA[ SET RetryCount=100
319
+ :RetryingRerun]]> </BatchLoopPart1 >
308
320
<BatchCLRTestLaunchCmds Condition =" '$(CLRTestKind)' == 'BuildAndRun' And $(TargetOS) != 'android'" >
309
321
<![CDATA[
310
322
$(BatchLinkerTestLaunchCmds)
@@ -323,6 +335,7 @@ if defined RunCrossGen2 (
323
335
)
324
336
325
337
ECHO %LAUNCHER% %ExePath% %CLRTestExecutionArguments%
338
+ $(BatchLoopPart1)
326
339
%LAUNCHER% %ExePath% %CLRTestExecutionArguments%
327
340
set CLRTestExitCode=!ERRORLEVEL!
328
341
if defined RunCrossGen2 (
0 commit comments