forked from OSchip/llvm-project
Revert "[lldb] Fix TestSettings.test_pass_host_env_vars on windows"
This reverts commit because of test failures in TestHelloWorld. It seems that this test (specifically running "ls" as a platform shell command) depended on the implicit passing of the host environment. The fix should be fairly simple (inherit the environment explicitly), but it may take me a while to figure where exactly to do that. Revert while I am figuring that out.
This commit is contained in:
parent
cc3b5590d2
commit
37889786b0
|
@ -23,9 +23,10 @@ using namespace lldb_private;
|
|||
namespace {
|
||||
void CreateEnvironmentBuffer(const Environment &env,
|
||||
std::vector<char> &buffer) {
|
||||
// The buffer is a list of null-terminated UTF-16 strings, followed by an
|
||||
// extra L'\0' (two bytes of 0). An empty environment must have one
|
||||
// empty string, followed by an extra L'\0'.
|
||||
if (env.size() == 0)
|
||||
return;
|
||||
|
||||
// Environment buffer is a null terminated list of null terminated strings
|
||||
for (const auto &KV : env) {
|
||||
std::wstring warg;
|
||||
if (llvm::ConvertUTF8toWide(Environment::compose(KV), warg)) {
|
||||
|
@ -37,9 +38,6 @@ void CreateEnvironmentBuffer(const Environment &env,
|
|||
// One null wchar_t (to end the block) is two null bytes
|
||||
buffer.push_back(0);
|
||||
buffer.push_back(0);
|
||||
// Insert extra two bytes, just in case the environment was empty.
|
||||
buffer.push_back(0);
|
||||
buffer.push_back(0);
|
||||
}
|
||||
|
||||
bool GetFlattenedWindowsCommandString(Args args, std::string &command) {
|
||||
|
@ -96,6 +94,7 @@ ProcessLauncherWindows::LaunchProcess(const ProcessLaunchInfo &launch_info,
|
|||
|
||||
LPVOID env_block = nullptr;
|
||||
::CreateEnvironmentBuffer(launch_info.GetEnvironment(), environment);
|
||||
if (!environment.empty())
|
||||
env_block = environment.data();
|
||||
|
||||
executable = launch_info.GetExecutableFile().GetPath();
|
||||
|
|
|
@ -286,6 +286,7 @@ class SettingsCommandTestCase(TestBase):
|
|||
"Environment variable 'MY_ENV_VAR' successfully passed."])
|
||||
|
||||
@skipIfRemote # it doesn't make sense to send host env to remote target
|
||||
@skipIf(oslist=["windows"])
|
||||
def test_pass_host_env_vars(self):
|
||||
"""Test that the host env vars are passed to the launched process."""
|
||||
self.build()
|
||||
|
|
Loading…
Reference in New Issue