Skip to content

Commit

Permalink
Fix R2RDump test in CG2 pipelines (dotnet#44460)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
trylek committed Nov 10, 2020
1 parent 04537c8 commit a79df14
Show file tree
Hide file tree
Showing 39 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/tests/issues.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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/*">
Expand Down Expand Up @@ -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/**">
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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\**" />
Expand Down

0 comments on commit a79df14

Please sign in to comment.