summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-07-10 14:46:14 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-07-10 14:46:14 -0400
commitd8292a629149c2cfdda6ae9df4e87aa117153c21 (patch)
tree97b70121a1b3df4c0795ecfa2aaded59fef4882b
parent31ccef8a666da54312a55663a7ac03061c4903be (diff)
SL-18837: Disable APR_LOG for now, but leave notes for the future.
-rw-r--r--.github/workflows/build.yaml3
-rw-r--r--indra/llcommon/tests/llprocess_test.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c0bc5f30e1..dc5fef4177 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -159,7 +159,8 @@ jobs:
}
export -f native_path shell_path finalize initialize_build initialize_version
export -f python_cmd repo_branch record_dependencies_graph sleep
- export APR_LOG="${RUNNER_TEMP}/apr.log"
+ ## Useful for diagnosing Windows LLProcess/LLLeap test failures
+ ##export APR_LOG="${RUNNER_TEMP}/apr.log"
export arch=$(uname | cut -b-6)
# Surprise! GH Windows runner's MINGW6 is a $arch value we've never
# seen before, so numerous tests don't know about it.
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)
{