Skip to content
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

Jump to bottom

[release/6.0-preview7] Fix an error printed out when install_location file is missing #56330

Merged
merged 2 commits into from
Jul 27, 2021
Merged

[release/6.0-preview7] Fix an error printed out when install_location file is missing #56330

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
4b31118
Fix an error printed out when install_location file is missing
vitek-karas Jul 26, 2021
67ebe2b
Fix a test
vitek-karas Jul 26, 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
32 changes: 32 additions & 0 deletions src/installer/tests/HostActivation.Tests/MultiArchInstallLocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,38 @@ public void InstallLocationFile_ReallyLongInstallPathIsParsedCorrectly()
}
}

[Fact]
[SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
public void InstallLocationFile_MissingFile()
{
var fixture = sharedTestState.PortableAppFixture.Copy();

var appExe = fixture.TestProject.AppExe;
string testArtifactsPath = SharedFramework.CalculateUniqueTestDirectory(Path.Combine(TestArtifact.TestArtifactsPath, "missingInstallLocation"));
using (new TestArtifact(testArtifactsPath))
using (var testOnlyProductBehavior = TestOnlyProductBehavior.Enable(appExe))
{
Directory.CreateDirectory(testArtifactsPath);

string directory = Path.Combine(testArtifactsPath, "installLocationOverride");
Directory.CreateDirectory(directory);
string nonExistentLocationFile = Path.Combine(directory, "install_location");
string defaultInstallLocation = Path.Combine(testArtifactsPath, "defaultInstallLocation");

Command.Create(appExe)
.CaptureStdErr()
.EnvironmentVariable(
Constants.TestOnlyEnvironmentVariables.InstallLocationFilePath,
nonExistentLocationFile)
.EnvironmentVariable(
Constants.TestOnlyEnvironmentVariables.DefaultInstallPath,
defaultInstallLocation)
.DotNetRoot(null)
.Execute()
.Should().NotHaveStdErrContaining("The install_location file");
}
}

public class SharedTestState : IDisposable
{
public string BaseDirectory { get; }
Expand Down
10 changes: 9 additions & 1 deletion src/native/corehost/hostmisc/pal.unix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,15 @@ bool pal::get_dotnet_self_registered_dir(pal::string_t* recv)
FILE* install_location_file = pal::file_open(install_location_file_path, "r");
if (install_location_file == nullptr)
{
trace::error(_X("The install_location file ['%s'] failed to open: %s."), install_location_file_path.c_str(), pal::strerror(errno));
if (errno == ENOENT)
{
trace::verbose(_X("The install_location file ['%s'] does not exist - skipping."), install_location_file_path.c_str());
}
else
{
trace::error(_X("The install_location file ['%s'] failed to open: %s."), install_location_file_path.c_str(), pal::strerror(errno));
}

return false;
}

Expand Down