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 7dc6211ad5ea83685a35c6fff740278343aa8b9d.

2 files changed, 2 insertions, 22 deletions

diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index 01515ecebf..e9edd165df 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -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;
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index 3ba3a8aab3..a01ec84547 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -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