From ca510f6c299335c8db27c65c10a8553801c06023 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 5 Jun 2023 22:08:26 -0400
Subject: SL-18837: Try giving temp Python scripts a .py extension.

On GitHub Windows Actions runners, we're getting permissions errors trying to
tell the Python interpreter to run a NamedTempFile script. Try using
NamedExtTempFile to give each such script a .py extension.
---
 indra/llcommon/tests/llprocess_test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index 81449b4a42..4adb8d872a 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -191,7 +191,7 @@ struct PythonProcessLauncher
     LLProcess::Params mParams;
     LLProcessPtr mPy;
     std::string mDesc;
-    NamedTempFile mScript;
+    NamedExtTempFile mScript;
 };
 
 /// convenience function for PythonProcessLauncher::run()
@@ -355,7 +355,7 @@ namespace tut
         set_test_name("raw APR nonblocking I/O");
 
         // Create a script file in a temporary place.
-        NamedTempFile script("py",
+        NamedExtTempFile script("py",
             "from __future__ import print_function" EOL
             "import sys" EOL
             "import time" EOL
-- 
cgit v1.2.3


From e933ace53b24b732d4111169e3c5964a8591a29e Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 7 Jul 2023 14:07:12 -0400
Subject: SL-18837: Try to bypass Windows perm problem with Python indirection.

---
 indra/llcommon/tests/llprocess_test.cpp | 41 ++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 16 deletions(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index 4adb8d872a..af99e97d66 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -124,6 +124,17 @@ 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.
  */
@@ -145,6 +156,7 @@ struct PythonProcessLauncher
 
         mParams.desc = desc + " script";
         mParams.executable = PYTHON;
+        mParams.args.add(test_python_script);
         mParams.args.add(mScript.getName());
     }
 
@@ -214,30 +226,26 @@ static std::string python_out(const std::string& desc, const CONTENT& script)
 class NamedTempDir: public boost::noncopyable
 {
 public:
-    // Use python() function to create a temp directory: I've found
-    // nothing in either Boost.Filesystem or APR quite like Python's
-    // tempfile.mkdtemp().
-    // Special extra bonus: on Mac, mkdtemp() reports a pathname
-    // starting with /var/folders/something, whereas that's really a
-    // symlink to /private/var/folders/something. Have to use
-    // realpath() to compare properly.
     NamedTempDir():
-        mPath(python_out("mkdtemp()",
-                         "from __future__ import with_statement\n"
-                         "import os.path, sys, tempfile\n"
-                         "with open(sys.argv[1], 'w') as f:\n"
-                         "    f.write(os.path.normcase(os.path.normpath(os.path.realpath(tempfile.mkdtemp()))))\n"))
-    {}
+        mPath(NamedTempFile::temp_path()),
+        mCreated(boost::filesystem::create_directories(mPath))
+    {
+        mPath = boost::filesystem::canonical(mPath);
+    }
 
     ~NamedTempDir()
     {
-        aprchk(apr_dir_remove(mPath.c_str(), gAPRPoolp));
+        if (mCreated)
+        {
+            boost::filesystem::remove_all(mPath);
+        }
     }
 
-    std::string getName() const { return mPath; }
+    std::string getName() const { return mPath.string(); }
 
 private:
-    std::string mPath;
+    boost::filesystem::path mPath;
+    bool mCreated;
 };
 
 /*****************************************************************************
@@ -390,6 +398,7 @@ 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);
 
-- 
cgit v1.2.3


From c4b5d089dad5680a0dd12b2d386b692318eb5c58 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 7 Jul 2023 16:57:20 -0400
Subject: 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.
---
 indra/llcommon/tests/llprocess_test.cpp | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

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);
 
-- 
cgit v1.2.3


From 1fc8758458c99b3a41965e33b3c62613c83e403a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 7 Jul 2023 17:31:50 -0400
Subject: SL-18837: Coax APR to log LLProcess launch attempts; show log file.

---
 indra/llcommon/tests/llprocess_test.cpp | 34 +++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index c7d1a2c86a..fbddc7f909 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -30,6 +30,7 @@
 #include "../test/namedtempfile.h"
 #include "../test/catch_and_store_what_in.h"
 #include "stringize.h"
+#include "lldir.h"
 #include "llsdutil.h"
 #include "llevents.h"
 #include "llstring.h"
@@ -151,8 +152,37 @@ struct PythonProcessLauncher
     /// Launch Python script; verify that it launched
     void launch()
     {
-        mPy = LLProcess::create(mParams);
-        tut::ensure(STRINGIZE("Couldn't launch " << mDesc << " script"), bool(mPy));
+        std::string logpath{ gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "apr.log") };
+#if LL_WINDOWS
+        _putenv_s("APR_LOG", logpath.c_str());
+#else
+        setenv("APR_LOG", logpath.c_str(), 1);
+#endif
+        try
+        {
+            mPy = LLProcess::create(mParams);
+            tut::ensure(STRINGIZE("Couldn't launch " << mDesc << " script"), bool(mPy));
+        }
+        catch (const tut::failure& err);
+        {
+            std::ifstream inf(logpath.c_str());
+            if (! inf.is_open())
+            {
+                LL_WARNS() << "Couldn't open '" << logpath << "'" << LL_ENDL;
+            }
+            else
+            {
+                LL_WARNS() << "==============================" << LL_ENDL;
+                LL_WARNS() << "From '" << logpath << "':" << LL_ENDL;
+                std::string line;
+                while (std::getline(line, inf))
+                {
+                    LL_WARNS() << line << LL_ENDL;
+                }
+                LL_WARNS() << "==============================" << LL_ENDL;
+            }
+            throw;
+        }
     }
 
     /// Run Python script and wait for it to complete.
-- 
cgit v1.2.3


From 8f81e1fa87123ff6255e9ee82e68c414efe05cdd Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 7 Jul 2023 17:47:57 -0400
Subject: SL-18837: Fix "lldir.h" #include

---
 indra/llcommon/tests/llprocess_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index fbddc7f909..9ee7890c7c 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -30,7 +30,7 @@
 #include "../test/namedtempfile.h"
 #include "../test/catch_and_store_what_in.h"
 #include "stringize.h"
-#include "lldir.h"
+#include "../llfilesystem/lldir.h"
 #include "llsdutil.h"
 #include "llevents.h"
 #include "llstring.h"
-- 
cgit v1.2.3


From 8aa3a0a7ed8cf3e3fedb2c98d6ea336fdd45e296 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 7 Jul 2023 19:48:02 -0400
Subject: SL-18837: Fix spurious semi

---
 indra/llcommon/tests/llprocess_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index 9ee7890c7c..fb5cf12cb2 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -163,7 +163,7 @@ struct PythonProcessLauncher
             mPy = LLProcess::create(mParams);
             tut::ensure(STRINGIZE("Couldn't launch " << mDesc << " script"), bool(mPy));
         }
-        catch (const tut::failure& err);
+        catch (const tut::failure& err)
         {
             std::ifstream inf(logpath.c_str());
             if (! inf.is_open())
-- 
cgit v1.2.3


From 09c5b01997e1d34e799a8a0ee3571bd181f9a665 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 7 Jul 2023 20:02:33 -0400
Subject: SL-18837: Hook in LLDir to allow reading APR log file.

---
 indra/llcommon/tests/llprocess_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index fb5cf12cb2..c6091bfeb1 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -175,7 +175,7 @@ struct PythonProcessLauncher
                 LL_WARNS() << "==============================" << LL_ENDL;
                 LL_WARNS() << "From '" << logpath << "':" << LL_ENDL;
                 std::string line;
-                while (std::getline(line, inf))
+                while (std::getline(inf, line))
                 {
                     LL_WARNS() << line << LL_ENDL;
                 }
-- 
cgit v1.2.3


From 908fb3fed6b858da4dc2b1c840b849e30ade2046 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 7 Jul 2023 20:54:34 -0400
Subject: SL-18837: Ditch unreferenced name of caught exception

---
 indra/llcommon/tests/llprocess_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index c6091bfeb1..827837d62a 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -163,7 +163,7 @@ struct PythonProcessLauncher
             mPy = LLProcess::create(mParams);
             tut::ensure(STRINGIZE("Couldn't launch " << mDesc << " script"), bool(mPy));
         }
-        catch (const tut::failure& err)
+        catch (const tut::failure&)
         {
             std::ifstream inf(logpath.c_str());
             if (! inf.is_open())
-- 
cgit v1.2.3


From f37d2c307617302f2ed5dfead7e280da54a7d3e4 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sat, 8 Jul 2023 09:04:33 -0400
Subject: SL-18837: Don't use LLDir, use NamedTempFile::temp_path.

Remove llcommon circular dependency on llfilesystem, which doesn't work for
this case anyway.
---
 indra/llcommon/tests/llprocess_test.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index 827837d62a..6fcc6fd8aa 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -30,7 +30,6 @@
 #include "../test/namedtempfile.h"
 #include "../test/catch_and_store_what_in.h"
 #include "stringize.h"
-#include "../llfilesystem/lldir.h"
 #include "llsdutil.h"
 #include "llevents.h"
 #include "llstring.h"
@@ -152,11 +151,9 @@ struct PythonProcessLauncher
     /// Launch Python script; verify that it launched
     void launch()
     {
-        std::string logpath{ gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "apr.log") };
+        std::string logpath{ NamedTempFile::temp_path("apr", ".log").string() };
 #if LL_WINDOWS
         _putenv_s("APR_LOG", logpath.c_str());
-#else
-        setenv("APR_LOG", logpath.c_str(), 1);
 #endif
         try
         {
-- 
cgit v1.2.3


From 1ec6c744048a2905b0f2bf83f035a8fb8798dbdf Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sat, 8 Jul 2023 11:08:16 -0400
Subject: SL-18837: Set APR_LOG once for the whole job

instead of a new value for each LLProcess::create() invocation.

Since the internal apr_log() function only looks at APR_LOG once per process,
the first test (which succeeded, hence no log file dump) left the log file
open with that same original pathname. Resetting the APR_LOG environment
variable for subsequent runs only made the new code in llprocess_test look for
files that were never created.
---
 indra/llcommon/tests/llprocess_test.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index 6fcc6fd8aa..a01ec84547 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -151,10 +151,6 @@ struct PythonProcessLauncher
     /// Launch Python script; verify that it launched
     void launch()
     {
-        std::string logpath{ NamedTempFile::temp_path("apr", ".log").string() };
-#if LL_WINDOWS
-        _putenv_s("APR_LOG", logpath.c_str());
-#endif
         try
         {
             mPy = LLProcess::create(mParams);
@@ -162,21 +158,25 @@ struct PythonProcessLauncher
         }
         catch (const tut::failure&)
         {
-            std::ifstream inf(logpath.c_str());
-            if (! inf.is_open())
-            {
-                LL_WARNS() << "Couldn't open '" << logpath << "'" << LL_ENDL;
-            }
-            else
+            const char* APR_LOG = getenv("APR_LOG");
+            if (APR_LOG && *APR_LOG)
             {
-                LL_WARNS() << "==============================" << LL_ENDL;
-                LL_WARNS() << "From '" << logpath << "':" << LL_ENDL;
-                std::string line;
-                while (std::getline(inf, line))
+                std::ifstream inf(APR_LOG);
+                if (! inf.is_open())
                 {
-                    LL_WARNS() << line << LL_ENDL;
+                    LL_WARNS() << "Couldn't open '" << APR_LOG << "'" << LL_ENDL;
+                }
+                else
+                {
+                    LL_WARNS() << "==============================" << LL_ENDL;
+                    LL_WARNS() << "From '" << APR_LOG << "':" << LL_ENDL;
+                    std::string line;
+                    while (std::getline(inf, line))
+                    {
+                        LL_WARNS() << line << LL_ENDL;
+                    }
+                    LL_WARNS() << "==============================" << LL_ENDL;
                 }
-                LL_WARNS() << "==============================" << LL_ENDL;
             }
             throw;
         }
-- 
cgit v1.2.3


From 7dc6211ad5ea83685a35c6fff740278343aa8b9d Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sat, 8 Jul 2023 14:08:16 -0400
Subject: SL-18837: Force llprocess_test and llleap_test to use just 'python'.

On GitHub Windows runners, trying to make build.yaml set PYTHON=python in the
environment doesn't work: integration tests still fail with "Access is denied"
because they're still trying to execute the interpreter's full pathname.

Instead, make llprocess_test and llleap_test detect the case of GitHub Windows
and override the environment variable PYTHON with a baked-in string constant
"python".
---
 indra/llcommon/tests/llprocess_test.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index a01ec84547..3ba3a8aab3 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -141,6 +141,15 @@ 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";
@@ -1013,7 +1022,9 @@ namespace tut
         set_test_name("get*Pipe() validation");
         PythonProcessLauncher py(get_test_name(),
             "from __future__ import print_function\n"
-            "print('this output is expected')\n");
+            "import sys\n"
+            "print('this output is expected')\n"
+            "print('run by', sys.executable)\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
-- 
cgit v1.2.3


From 31ccef8a666da54312a55663a7ac03061c4903be Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 10 Jul 2023 14:35:41 -0400
Subject: 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.
---
 indra/llcommon/tests/llprocess_test.cpp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

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
-- 
cgit v1.2.3


From d8292a629149c2cfdda6ae9df4e87aa117153c21 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 10 Jul 2023 14:46:14 -0400
Subject: SL-18837: Disable APR_LOG for now, but leave notes for the future.

---
 indra/llcommon/tests/llprocess_test.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index a01ec84547..9ca664c80c 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -158,6 +158,9 @@ struct PythonProcessLauncher
         }
         catch (const tut::failure&)
         {
+            // On Windows, if APR_LOG is set, our version of APR's
+            // apr_create_proc() logs to the specified file. If this test
+            // failed, try to report that log.
             const char* APR_LOG = getenv("APR_LOG");
             if (APR_LOG && *APR_LOG)
             {
-- 
cgit v1.2.3


From c77737b925e3687e47d3a1dce1b7e8b481302741 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 10 Jul 2023 15:26:21 -0400
Subject: SL-18837: Windows failures in setWorkingDirectory(): C: vs. c: (sigh)

Normalize the case of the name of the temp directory for string comparison.
---
 indra/llcommon/tests/llprocess_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index 9ca664c80c..c1cb2af7fe 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -591,7 +591,7 @@ namespace tut
                                  "    f.write(os.path.normcase(os.path.normpath(os.getcwd())))\n");
         // Before running, call setWorkingDirectory()
         py.mParams.cwd = tempdir.getName();
-        ensure_equals("os.getcwd()", py.run_read(), tempdir.getName());
+        ensure_equals("os.getcwd()", py.run_read(), utf8str_tolower(tempdir.getName()));
     }
 
     template<> template<>
-- 
cgit v1.2.3


From 4b158580e5654615d2a5510267bf76392c9666fa Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 17 Jul 2023 16:47:50 -0400
Subject: SL-18837: Lowercasing pathname for string compare is Windows-only.

---
 indra/llcommon/tests/llprocess_test.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon/tests/llprocess_test.cpp')

diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index c1cb2af7fe..b6b297b8d7 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -591,7 +591,13 @@ namespace tut
                                  "    f.write(os.path.normcase(os.path.normpath(os.getcwd())))\n");
         // Before running, call setWorkingDirectory()
         py.mParams.cwd = tempdir.getName();
-        ensure_equals("os.getcwd()", py.run_read(), utf8str_tolower(tempdir.getName()));
+        std::string expected{ tempdir.getName() };
+#if LL_WINDOWS
+        // SIGH, don't get tripped up by "C:" != "c:" --
+        // but on the Mac, using tolower() fails because "/users" != "/Users"!
+        expected = utf8str_tolower(expected);
+#endif
+        ensure_equals("os.getcwd()", py.run_read(), expected);
     }
 
     template<> template<>
-- 
cgit v1.2.3