Skip to content

Fix System.Runtime tests for single file runner #50996

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

Merged
merged 2 commits into from
Apr 19, 2021
Merged

Fix System.Runtime tests for single file runner #50996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c290cd
Fix System.Runtime tests for single file runner
MichalStrehovsky Apr 9, 2021
2d93923
Update ModuleTests.cs
MichalStrehovsky Apr 16, 2021
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
2 changes: 2 additions & 0 deletions eng/testing/tests.singlefile.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>

<DefineConstants>$(DefineConstants);SINGLE_FILE_TEST_RUNNER</DefineConstants>

<BundleDir>$([MSBuild]::NormalizeDirectory('$(OutDir)', 'publish'))</BundleDir>
<RunScriptOutputPath>$([MSBuild]::NormalizePath('$(BundleDir)', '$(RunScriptOutputName)'))</RunScriptOutputPath>
<RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
Expand Down
8 changes: 8 additions & 0 deletions src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ public void CustomAttributes()
[Fact]
public void FullyQualifiedName()
{
#if SINGLE_FILE_TEST_RUNNER
Assert.Equal("<Unknown>", Module.FullyQualifiedName);
#else
var loc = AssemblyPathHelper.GetAssemblyLocation(Assembly.GetExecutingAssembly());

// Browser will include the path (/), so strip it
Expand All @@ -90,12 +93,17 @@ public void FullyQualifiedName()
}

Assert.Equal(loc, Module.FullyQualifiedName);
#endif
}

[Fact]
public void Name()
{
#if SINGLE_FILE_TEST_RUNNER
Assert.Equal("<Unknown>", Module.Name, ignoreCase: true);
#else
Assert.Equal("system.runtime.tests.dll", Module.Name, ignoreCase: true);
#endif
}

[Fact]
Expand Down