livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-18837: Revert "Force llprocess_test and llleap_test to use just 'python'." 

Turns out that the pathname of the Python executable wasn't the issue.

This reverts commit 7dc6211ad5.
meow-7.2.2
Nat Goodspeed 2023-07-10 14:35:41 -04:00
parent 13d44e5bed
commit 31ccef8a66
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llcommon/tests/llleap_test.cpp
View File

@ -193,20 +193,11 @@ namespace tut
reader.getName().substr(0, reader.getName().length()-3))),
PYTHON(LLStringUtil::getenv("PYTHON"))
{
#if LL_WINDOWS
// Weirdly, on GitHub Windows runners, plain 'python' works much
// better than a full pathname.
const char* RUNNER_TEMP = getenv("RUNNER_TEMP");
if (RUNNER_TEMP && *RUNNER_TEMP)
{
PYTHON = "python";
}
#endif
ensure("Set PYTHON to interpreter pathname", !PYTHON.empty());
}
NamedExtTempFile reader;
const std::string reader_module;
std::string PYTHON;
const std::string PYTHON;
};
typedef test_group<llleap_data> llleap_group;
typedef llleap_group::object object;

13
indra/llcommon/tests/llprocess_test.cpp
View File

@ -141,15 +141,6 @@ struct PythonProcessLauncher
mScript("py", script)
{
auto PYTHON(LLStringUtil::getenv("PYTHON"));
#if LL_WINDOWS
// Weirdly, on GitHub Windows runners, plain 'python' works much better
// than a full pathname.
const char* RUNNER_TEMP = getenv("RUNNER_TEMP");
if (RUNNER_TEMP && *RUNNER_TEMP)
{
PYTHON = "python";
}
#endif
tut::ensure("Set $PYTHON to the Python interpreter", !PYTHON.empty());
mParams.desc = desc + " script";
@ -1022,9 +1013,7 @@ namespace tut
set_test_name("get*Pipe() validation");
PythonProcessLauncher py(get_test_name(),
"from __future__ import print_function\n"
"import sys\n"
"print('this output is expected')\n"
"print('run by', sys.executable)\n");
"print('this output is expected')\n");
py.mParams.files.add(LLProcess::FileParam("pipe")); // pipe for stdin
py.mParams.files.add(LLProcess::FileParam()); // inherit stdout
py.mParams.files.add(LLProcess::FileParam("pipe")); // pipe for stderr