Skip to content

Fix racy mvid tests. #125537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrvoorhe wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix racy mvid tests. #125537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions ...rator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/CommandLine.Mvid.IndividualTests.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using System;
using System.Threading.Tasks;
using Xunit;

namespace ILLink.RoslynAnalyzer.Tests.CommandLine.Mvid
{
public sealed partial class IndividualTests : LinkerTestBase
{

protected override string TestSuiteName => "CommandLine.Mvid.Individual";

[Fact]
public Task DeterministicMvidWorks()
{
return RunTest(allowMissingWarnings: true);
}

[Fact]
public Task NewMvidWorks()
{
return RunTest(allowMissingWarnings: true);
}

[Fact]
public Task RetainMvid()
{
return RunTest(allowMissingWarnings: true);
}

}
}
18 changes: 0 additions & 18 deletions ....Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/CommandLine.MvidTests.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,5 @@ public Task DefaultMvidBehavior()
return RunTest(allowMissingWarnings: true);
}

[Fact]
public Task DeterministicMvidWorks()
{
return RunTest(allowMissingWarnings: true);
}

[Fact]
public Task NewMvidWorks()
{
return RunTest(allowMissingWarnings: true);
}

[Fact]
public Task RetainMvid()
{
return RunTest(allowMissingWarnings: true);
}

}
}
2 changes: 1 addition & 1 deletion ...ommandLine/Mvid/DeterministicMvidWorks.cs → ...Mvid/Individual/DeterministicMvidWorks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Mono.Linker.Tests.Cases.Expectations.Assertions;
using Mono.Linker.Tests.Cases.Expectations.Metadata;

namespace Mono.Linker.Tests.Cases.CommandLine.Mvid
namespace Mono.Linker.Tests.Cases.CommandLine.Mvid.Individual
{
[SetupLinkerArgument("--deterministic", "true")]
public class DeterministicMvidWorks
Expand Down
2 changes: 1 addition & 1 deletion ...ts.Cases/CommandLine/Mvid/NewMvidWorks.cs → ...mmandLine/Mvid/Individual/NewMvidWorks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Mono.Linker.Tests.Cases.Expectations.Assertions;
using Mono.Linker.Tests.Cases.Expectations.Metadata;

namespace Mono.Linker.Tests.Cases.CommandLine.Mvid
namespace Mono.Linker.Tests.Cases.CommandLine.Mvid.Individual
{
[SetupLinkerArgument("--new-mvid", "true")]
public class NewMvidWorks
Expand Down
2 changes: 1 addition & 1 deletion ...ests.Cases/CommandLine/Mvid/RetainMvid.cs → ...CommandLine/Mvid/Individual/RetainMvid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Mono.Linker.Tests.Cases.Expectations.Assertions;
using Mono.Linker.Tests.Cases.Expectations.Metadata;

namespace Mono.Linker.Tests.Cases.CommandLine.Mvid
namespace Mono.Linker.Tests.Cases.CommandLine.Mvid.Individual
{
[SetupLinkerArgument("--new-mvid", "false")]
public class RetainMvid
Expand Down
9 changes: 9 additions & 0 deletions src/tools/illink/test/Mono.Linker.Tests/TestCases/IndividualTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.Xml;
using Mono.Cecil;
using Mono.Linker.Tests.Cases.CommandLine.Mvid;
using Mono.Linker.Tests.Cases.CommandLine.Mvid.Individual;
using Mono.Linker.Tests.Cases.Interop.PInvoke.Individual;
using Mono.Linker.Tests.Cases.References.Individual;
using Mono.Linker.Tests.Cases.Tracing.Individual;
Expand Down Expand Up @@ -199,6 +200,7 @@ public void DeterministicMvidWorks()
{
var testCase = CreateIndividualCase(typeof(DeterministicMvidWorks));
var result = Run(testCase, out TestRunner runner);
Check(result);

var originalMvid = GetMvid(result.InputAssemblyPath);
var firstOutputMvid = GetMvid(result.OutputAssemblyPath);
Expand All @@ -217,6 +219,7 @@ public void NewMvidWorks()
{
var testCase = CreateIndividualCase(typeof(NewMvidWorks));
var result = Run(testCase, out TestRunner runner);
Check(result);

var originalMvid = GetMvid(result.InputAssemblyPath);
var firstOutputMvid = GetMvid(result.OutputAssemblyPath);
Expand All @@ -234,6 +237,7 @@ public void RetainMvidWorks()
{
var testCase = CreateIndividualCase(typeof(RetainMvid));
var result = Run(testCase, out TestRunner runner);
Check(result);

var originalMvid = GetMvid(result.InputAssemblyPath);
var firstOutputMvid = GetMvid(result.OutputAssemblyPath);
Expand Down Expand Up @@ -269,5 +273,10 @@ protected virtual TrimmedTestCaseResult Run(TestCase testCase, out TestRunner ru
runner = new TestRunner(new ObjectFactory());
return runner.Run(testCase);
}

protected virtual void Check(TrimmedTestCaseResult linkedResult)
{
new ResultChecker().Check(linkedResult);
}
}
}
Loading