summaryrefslogtreecommitdiff
path: root/indra/llcommon/tests/llprocess_test.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-07-07 16:57:20 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-07-07 16:57:20 -0400
commitc4b5d089dad5680a0dd12b2d386b692318eb5c58 (patch)
tree433aaed515411c9ce071de87c969e64aebf292f5 /indra/llcommon/tests/llprocess_test.cpp
parente933ace53b24b732d4111169e3c5964a8591a29e (diff)
SL-18837: Partially revert e933ace, keeping useful tweaks.
Introducing indirection via test_python_script.py did NOT address the "Access is denied" errors on GitHub Windows runners.
Diffstat (limited to 'indra/llcommon/tests/llprocess_test.cpp')
-rw-r--r--indra/llcommon/tests/llprocess_test.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index af99e97d66..c7d1a2c86a 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -124,17 +124,6 @@ void waitfor(LLProcess::handle h, const std::string& desc, int timeout=60)
i < timeout);
}
-namespace {
-
-// find test helper, a sibling of this file
-// nat 2023-07-07: we're currently using Boost 1.81, but
-// path::replace_filename() (which is exactly what we need here) doesn't
-// arrive until Boost 1.82.
-auto test_python_script{
- (boost::filesystem::path(__FILE__).remove_filename() / "test_python_script.py").string() };
-
-}
-
/**
* Construct an LLProcess to run a Python script.
*/
@@ -156,7 +145,6 @@ struct PythonProcessLauncher
mParams.desc = desc + " script";
mParams.executable = PYTHON;
- mParams.args.add(test_python_script);
mParams.args.add(mScript.getName());
}
@@ -398,7 +386,6 @@ namespace tut
// Have to have a named copy of this std::string so its c_str() value
// will persist.
std::string scriptname(script.getName());
- argv.push_back(test_python_script.c_str());
argv.push_back(scriptname.c_str());
argv.push_back(NULL);