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.

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

Exec: stop setting a locale on Unix. #9449

Merged
merged 1 commit into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions src/Tasks.UnitTests/Exec_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,42 @@ public void EscapeSpecifiedCharactersInPathToGeneratedBatchFile()
}
}

[UnixOnlyTheory]
[InlineData(true)]
[InlineData(false)]
public void ExecSetsLocaleOnUnix(bool enableChangeWave)
{
using (var env = TestEnvironment.Create())
{
env.SetEnvironmentVariable("LANG", null);
env.SetEnvironmentVariable("LC_ALL", null);

if (enableChangeWave)
{
ChangeWaves.ResetStateForTests();
// Important: use the version here
env.SetEnvironmentVariable("MSBUILDDISABLEFEATURESFROMVERSION", ChangeWaves.Wave17_10.ToString());
BuildEnvironmentHelper.ResetInstance_ForUnitTestsOnly();
}

Exec exec = PrepareExec("echo LANG=$LANG; echo LC_ALL=$LC_ALL;");
bool result = exec.Execute();
Assert.True(result);

MockEngine engine = (MockEngine)exec.BuildEngine;
if (enableChangeWave)
{
engine.AssertLogContains("LANG=en_US.UTF-8");
engine.AssertLogContains("LC_ALL=en_US.UTF-8");
}
else
{
engine.AssertLogDoesntContain("LANG=en_US.UTF-8");
engine.AssertLogDoesntContain("LC_ALL=en_US.UTF-8");
}
}
}

/// <summary>
/// Ensures that calling the Exec task does not leave any extra TEMP files
/// lying around.
Expand Down
7 changes: 6 additions & 1 deletion src/Tasks/Exec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,12 @@ protected internal override void AddCommandLineCommands(CommandLineBuilderExtens
{
commandLine.AppendSwitch("-c");
commandLine.AppendTextUnquoted(" \"");
commandLine.AppendTextUnquoted("export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; . ");
bool setLocale = !ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_10);
if (setLocale)
{
commandLine.AppendTextUnquoted("export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; ");
}
commandLine.AppendTextUnquoted(". ");
commandLine.AppendFileNameIfNotNull(batchFileForCommandLine);
commandLine.AppendTextUnquoted("\"");
}
Expand Down