Skip to content

Fix TestRunDirectories crash on Android with relative/empty paths #7787

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
Evangelink merged 2 commits into from
Apr 24, 2026
Merged

Fix TestRunDirectories crash on Android with relative/empty paths #7787

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
2813a3e
Fix TestRunDirectories crash on Android with relative/empty paths
jonathanpeppers Apr 23, 2026
b1443ef
Fix where copilot used null forgiving `!`
jonathanpeppers Apr 23, 2026
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
10 changes: 7 additions & 3 deletions src/Adapter/MSTestAdapter.PlatformServices/Deployment/TestRunDirectories.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,13 @@ public TestRunDirectories(string rootDirectory, string? firstTestSource, bool is
RootDeploymentDirectory = rootDirectory;
InDirectory = Path.Combine(RootDeploymentDirectory, DeploymentInDirectorySuffix);

OutDirectory = isAppDomainCreationDisabled && firstTestSource is not null
? Path.GetDirectoryName(firstTestSource)!
: Path.Combine(RootDeploymentDirectory, DeploymentOutDirectorySuffix);
string? testSourceDirectory = isAppDomainCreationDisabled && !StringEx.IsNullOrEmpty(firstTestSource)
Comment thread
Evangelink marked this conversation as resolved.
? Path.GetDirectoryName(firstTestSource)
: null;

OutDirectory = StringEx.IsNullOrEmpty(testSourceDirectory)
? Path.Combine(RootDeploymentDirectory, DeploymentOutDirectorySuffix)
: testSourceDirectory;

InMachineNameDirectory = Path.Combine(InDirectory, Environment.MachineName);
}
Expand Down
15 changes: 15 additions & 0 deletions .../UnitTests/MSTestAdapter.PlatformServices.UnitTests/Deployment/TestRunDirectoriesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,19 @@ public void OutDirectoryShouldReturnCorrectDirectory()

public void InMachineNameDirectoryShouldReturnMachineSpecificDeploymentDirectory()
=> _testRunDirectories.InMachineNameDirectory.Should().Be(Path.Combine(@"C:\temp\In", Environment.MachineName));

public void OutDirectoryShouldFallBackWhenFirstTestSourceIsEmpty()
{
// Simulates Android CoreCLR where Assembly.Location returns "" (before synthetic path).
var directories = new TestRunDirectories(@"C:\temp", firstTestSource: string.Empty, isAppDomainCreationDisabled: true);
directories.OutDirectory.Should().Be(@"C:\temp\Out");
}

public void OutDirectoryShouldFallBackWhenFirstTestSourceIsRelativePath()
{
// Simulates Android MonoVM / CoreCLR after PR #7772 where Assembly.Location
// is a relative filename like "MyTests.dll" with no directory component.
var directories = new TestRunDirectories(@"C:\temp", firstTestSource: "MyTests.dll", isAppDomainCreationDisabled: true);
directories.OutDirectory.Should().Be(@"C:\temp\Out");
}
}