Fix R2RDump test in CG2 pipelines (#44460)

Our scripts normally assume that all test projects are at least
two nesting levels deep under $(TestBinDir); the r2rdump test was
violating that and, in doing so, it was triggering a failure in
CG2 compilation.

After I decided to fix this by moving the r2rdump folder under
"readytorun" I found out that there already is a r2rdump folder
there - apparently Amy during her initial R2RDump implementation
authored a basic test suite even though it's disabled right now.

I have resolved this by moving the original test under
"readytorun/r2rdump" to "readytorun/r2rdump/BasicTests" and I moved
Andrew's new test under "readytorun/r2rdump/FrameworkTests".
I'm not super happy about the naming but I don't have any better
ideas at the moment, I'll be happy to improve this based on PR
feedback.

Thanks

Tomas

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 800f062..c2fcc77 100644 (file)
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -118,7 +118,7 @@
         <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/generics/Variance/Interfaces/Interfaces001/*">
             <Issue>https://github.com/dotnet/runtime/issues/3893</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/readytorun/r2rdump/R2RDumpTest/*">
+        <ExcludeList Include="$(XunitTestBinBase)/readytorun/r2rdump/BasicTests/R2RDumpTest/*">
             <Issue>https://github.com/dotnet/runtime/issues/10888 https://github.com/dotnet/runtime/issues/11823 </Issue>
         </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/readytorun/crossgen2/crossgen2smoke_donotalwaysusecrossgen2/*">
@@ -1565,7 +1565,7 @@
         <ExcludeList Include="$(XunitTestBinBase)/profiler/rejit/rejit/rejit.sh">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/r2rdump/R2RDumpTests/*">
+        <ExcludeList Include="$(XunitTestBinBase)/readytorun/r2rdump/FrameworkTests/R2RDumpTests/*">
             <Issue>These tests are not supposed to be run with mono.</Issue>
         </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/readytorun/crossgen2/crossgen2smoke/**">

diff --git a/src/tests/readytorun/r2rdump/BasicTests.cs b/src/tests/readytorun/r2rdump/BasicTests/BasicTests.cs
similarity index 100%
rename from src/tests/readytorun/r2rdump/BasicTests.cs
rename to src/tests/readytorun/r2rdump/BasicTests/BasicTests.cs

diff --git a/src/tests/readytorun/r2rdump/R2RDumpTest.csproj b/src/tests/readytorun/r2rdump/BasicTests/R2RDumpTest.csproj
similarity index 100%
rename from src/tests/readytorun/r2rdump/R2RDumpTest.csproj
rename to src/tests/readytorun/r2rdump/BasicTests/R2RDumpTest.csproj

diff --git a/src/tests/readytorun/r2rdump/TestHelpers.cs b/src/tests/readytorun/r2rdump/BasicTests/TestHelpers.cs
similarity index 100%
rename from src/tests/readytorun/r2rdump/TestHelpers.cs
rename to src/tests/readytorun/r2rdump/BasicTests/TestHelpers.cs

diff --git a/src/tests/readytorun/r2rdump/files/GcInfoTransitions.cs b/src/tests/readytorun/r2rdump/BasicTests/files/GcInfoTransitions.cs
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/GcInfoTransitions.cs
rename to src/tests/readytorun/r2rdump/BasicTests/files/GcInfoTransitions.cs

diff --git a/src/tests/readytorun/r2rdump/files/GcInfoTransitions.csproj b/src/tests/readytorun/r2rdump/BasicTests/files/GcInfoTransitions.csproj
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/GcInfoTransitions.csproj
rename to src/tests/readytorun/r2rdump/BasicTests/files/GcInfoTransitions.csproj

diff --git a/src/tests/readytorun/r2rdump/files/GenericFunctions.cs b/src/tests/readytorun/r2rdump/BasicTests/files/GenericFunctions.cs
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/GenericFunctions.cs
rename to src/tests/readytorun/r2rdump/BasicTests/files/GenericFunctions.cs

diff --git a/src/tests/readytorun/r2rdump/files/GenericFunctions.csproj b/src/tests/readytorun/r2rdump/BasicTests/files/GenericFunctions.csproj
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/GenericFunctions.csproj
rename to src/tests/readytorun/r2rdump/BasicTests/files/GenericFunctions.csproj

diff --git a/src/tests/readytorun/r2rdump/files/HelloWorld.cs b/src/tests/readytorun/r2rdump/BasicTests/files/HelloWorld.cs
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/HelloWorld.cs
rename to src/tests/readytorun/r2rdump/BasicTests/files/HelloWorld.cs

diff --git a/src/tests/readytorun/r2rdump/files/HelloWorld.csproj b/src/tests/readytorun/r2rdump/BasicTests/files/HelloWorld.csproj
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/HelloWorld.csproj
rename to src/tests/readytorun/r2rdump/BasicTests/files/HelloWorld.csproj

diff --git a/src/tests/readytorun/r2rdump/files/MultipleRuntimeFunctions.cs b/src/tests/readytorun/r2rdump/BasicTests/files/MultipleRuntimeFunctions.cs
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/MultipleRuntimeFunctions.cs
rename to src/tests/readytorun/r2rdump/BasicTests/files/MultipleRuntimeFunctions.cs

diff --git a/src/tests/readytorun/r2rdump/files/MultipleRuntimeFunctions.csproj b/src/tests/readytorun/r2rdump/BasicTests/files/MultipleRuntimeFunctions.csproj
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/MultipleRuntimeFunctions.csproj
rename to src/tests/readytorun/r2rdump/BasicTests/files/MultipleRuntimeFunctions.csproj

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Release/GcInfoTransitions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Checked/GcInfoTransitions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Release/GcInfoTransitions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Checked/GcInfoTransitions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Release/GenericFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Checked/GenericFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Release/GenericFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Checked/GenericFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Release/HelloWorld.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Checked/HelloWorld.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Release/HelloWorld.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Checked/HelloWorld.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Release/MultipleRuntimeFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Checked/MultipleRuntimeFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Release/MultipleRuntimeFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Checked/MultipleRuntimeFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Debug/GcInfoTransitions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Debug/GcInfoTransitions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Debug/GcInfoTransitions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Debug/GcInfoTransitions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Debug/GenericFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Debug/GenericFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Debug/GenericFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Debug/GenericFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Debug/HelloWorld.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Debug/HelloWorld.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Debug/HelloWorld.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Debug/HelloWorld.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Debug/MultipleRuntimeFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Debug/MultipleRuntimeFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Debug/MultipleRuntimeFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Debug/MultipleRuntimeFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Checked/GcInfoTransitions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Release/GcInfoTransitions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Checked/GcInfoTransitions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Release/GcInfoTransitions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Checked/GenericFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Release/GenericFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Checked/GenericFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Release/GenericFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Checked/HelloWorld.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Release/HelloWorld.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Checked/HelloWorld.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Release/HelloWorld.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x64.Checked/MultipleRuntimeFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Release/MultipleRuntimeFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x64.Checked/MultipleRuntimeFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x64.Release/MultipleRuntimeFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Release/GcInfoTransitions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Checked/GcInfoTransitions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Release/GcInfoTransitions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Checked/GcInfoTransitions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Release/GenericFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Checked/GenericFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Release/GenericFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Checked/GenericFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Release/HelloWorld.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Checked/HelloWorld.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Release/HelloWorld.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Checked/HelloWorld.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Release/MultipleRuntimeFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Checked/MultipleRuntimeFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Release/MultipleRuntimeFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Checked/MultipleRuntimeFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Debug/GcInfoTransitions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Debug/GcInfoTransitions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Debug/GcInfoTransitions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Debug/GcInfoTransitions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Debug/GenericFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Debug/GenericFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Debug/GenericFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Debug/GenericFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Debug/HelloWorld.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Debug/HelloWorld.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Debug/HelloWorld.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Debug/HelloWorld.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Debug/MultipleRuntimeFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Debug/MultipleRuntimeFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Debug/MultipleRuntimeFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Debug/MultipleRuntimeFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Checked/GcInfoTransitions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Release/GcInfoTransitions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Checked/GcInfoTransitions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Release/GcInfoTransitions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Checked/GenericFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Release/GenericFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Checked/GenericFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Release/GenericFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Checked/HelloWorld.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Release/HelloWorld.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Checked/HelloWorld.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Release/HelloWorld.xml

diff --git a/src/tests/readytorun/r2rdump/files/Windows_NT.x86.Checked/MultipleRuntimeFunctions.xml b/src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Release/MultipleRuntimeFunctions.xml
similarity index 100%
rename from src/tests/readytorun/r2rdump/files/Windows_NT.x86.Checked/MultipleRuntimeFunctions.xml
rename to src/tests/readytorun/r2rdump/BasicTests/files/Windows_NT.x86.Release/MultipleRuntimeFunctions.xml

diff --git a/src/tests/readytorun/r2rdump/rebaseline.cmd b/src/tests/readytorun/r2rdump/BasicTests/rebaseline.cmd
similarity index 100%
rename from src/tests/readytorun/r2rdump/rebaseline.cmd
rename to src/tests/readytorun/r2rdump/BasicTests/rebaseline.cmd

diff --git a/src/tests/r2rdump/R2RDumpTester.cs b/src/tests/readytorun/r2rdump/FrameworkTests/R2RDumpTester.cs
similarity index 100%
rename from src/tests/r2rdump/R2RDumpTester.cs
rename to src/tests/readytorun/r2rdump/FrameworkTests/R2RDumpTester.cs

diff --git a/src/tests/r2rdump/R2RDumpTests.csproj b/src/tests/readytorun/r2rdump/FrameworkTests/R2RDumpTests.csproj
similarity index 92%
rename from src/tests/r2rdump/R2RDumpTests.csproj
rename to src/tests/readytorun/r2rdump/FrameworkTests/R2RDumpTests.csproj
index a60d535..39f1cdb 100644 (file)
--- a/src/tests/r2rdump/R2RDumpTests.csproj
+++ b/src/tests/readytorun/r2rdump/FrameworkTests/R2RDumpTests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="R2RDumpTester.cs" />
-    <Compile Include="..\Common\XunitBase.cs" />
+    <Compile Include="..\..\..\Common\XunitBase.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="Resources\**" />