From 31ae7c27ba28f6af7ae8962510e0150c4d2986b8 Mon Sep 17 00:00:00 2001
From: Andrew Au <andrewau@microsoft.com>
Date: Mon, 19 Aug 2024 14:28:22 -0700
Subject: [PATCH] Hacking test script

---
 src/tests/Common/CLRTest.Execute.Batch.targets      | 13 +++++++++++++
 .../Coreclr.TestWrapper/CoreclrTestWrapperLib.cs    |  2 ++
 .../coreroot_determinism.csproj                     |  2 ++
 3 files changed, 17 insertions(+)

diff --git a/src/tests/Common/CLRTest.Execute.Batch.targets b/src/tests/Common/CLRTest.Execute.Batch.targets
index f19c8987bbc6f..45ece77103079 100644
--- a/src/tests/Common/CLRTest.Execute.Batch.targets
+++ b/src/tests/Common/CLRTest.Execute.Batch.targets
@@ -146,6 +146,15 @@ if not defined CLRTestExecutionArguments (set CLRTestExecutionArguments=$(CLRTes
       ]]></BatchCLRTestArgPrep>
 
       <!-- By default, be prepared to do a full check -->
+      <BatchLoopPart2  Condition="'$(CLRTestLoop)' == 'true'"><![CDATA[SET /A RetryCount=%RetryCount%-1
+  IF NOT "%RetryCount%"=="0" (
+    GOTO :RetryingRerun
+  ) ELSE (
+    ECHO END EXECUTION - PASSED BUT ALSO FAILED
+    ECHO FAILED
+    popd
+    Exit /b 1
+  )]]></BatchLoopPart2>
       <BatchCLRTestExitCodeCheck><![CDATA[
 ECHO Expected: %CLRTestExpectedExitCode%
 ECHO Actual: %CLRTestExitCode%
@@ -157,6 +166,7 @@ IF NOT "%CLRTestExitCode%"=="%CLRTestExpectedExitCode%" (
 ) ELSE (
   ECHO END EXECUTION - PASSED
   ECHO PASSED
+  $(BatchLoopPart2)
   popd
   Exit /b 0
 )
@@ -305,6 +315,8 @@ REM Local CoreShim requested - see MSBuild property 'CLRTestScriptLocalCoreShim'
 ECHO Copying '%CORE_ROOT%\CoreShim.dll'...
 COPY /y %CORE_ROOT%\CoreShim.dll .
       ]]></BatchCopyCoreShimLocalCmds>
+      <BatchLoopPart1 Condition="'$(CLRTestLoop)' == 'true'"><![CDATA[SET RetryCount=100
+:RetryingRerun]]></BatchLoopPart1>
       <BatchCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And $(TargetOS) != 'android'">
     <![CDATA[
 $(BatchLinkerTestLaunchCmds)
@@ -323,6 +335,7 @@ if defined RunCrossGen2 (
 )
 
 ECHO %LAUNCHER% %ExePath% %CLRTestExecutionArguments%
+$(BatchLoopPart1)
 %LAUNCHER% %ExePath% %CLRTestExecutionArguments%
 set CLRTestExitCode=!ERRORLEVEL!
 if defined RunCrossGen2 (
diff --git a/src/tests/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs b/src/tests/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
index 3b42c400d5769..260f325c0c797 100644
--- a/src/tests/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
+++ b/src/tests/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
@@ -687,6 +687,7 @@ public int RunTest(string executable, string outputFile, string errorFile, strin
             using (var errorWriter = new StreamWriter(errorStream))
             using (Process process = new Process())
             {
+                outputWriter.WriteLine("Andrew modified CoreclrTestWrapper is running '" + executable + "'");
                 if (MobileAppHandler.IsRetryRequested(testBinaryBase))
                 {
                     outputWriter.WriteLine("\nWork item retry had been requested earlier - skipping test...");
@@ -719,6 +720,7 @@ public int RunTest(string executable, string outputFile, string errorFile, strin
                     Task copyOutput = process.StandardOutput.BaseStream.CopyToAsync(outputStream, 4096, cts.Token);
                     Task copyError = process.StandardError.BaseStream.CopyToAsync(errorStream, 4096, cts.Token);
 
+                    
                     if (process.WaitForExit(timeout))
                     {
                         // Process completed. Check process.ExitCode here.
diff --git a/src/tests/readytorun/coreroot_determinism/coreroot_determinism.csproj b/src/tests/readytorun/coreroot_determinism/coreroot_determinism.csproj
index f6d4a241579db..74b4093935987 100644
--- a/src/tests/readytorun/coreroot_determinism/coreroot_determinism.csproj
+++ b/src/tests/readytorun/coreroot_determinism/coreroot_determinism.csproj
@@ -10,6 +10,8 @@
     <!-- We skip the ReadyToRun tests when sanitized due to build complexity -->
     <DisableProjectBuild Condition="'$(EnableNativeSanitizers)' != ''">true</DisableProjectBuild>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <!-- Rerun the test for 100 times or stop if we get a failure -->
+    <CLRTestLoop>true</CLRTestLoop>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />