diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-02-06 15:53:14 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2019-02-06 15:53:14 -0500 |
| commit | e449ad4544afc1ceb9b1bbbc0798af6faadbc760 (patch) | |
| tree | 03d10afa3850c514cb864924a36aa63357b61895 /indra/llcommon/tests/llprocess_test.cpp | |
| parent | 2d3b805b949a294d3f298eb3d786aac777ebb51e (diff) | |
| parent | 0d27cb37bfea618896b0b4c5a422880e1a882210 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/vir-fixes
Diffstat (limited to 'indra/llcommon/tests/llprocess_test.cpp')
| -rw-r--r-- | indra/llcommon/tests/llprocess_test.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp index b27e125d2e..5c87cdabd9 100644 --- a/indra/llcommon/tests/llprocess_test.cpp +++ b/indra/llcommon/tests/llprocess_test.cpp @@ -34,6 +34,7 @@ #include "stringize.h" #include "llsdutil.h" #include "llevents.h" +#include "llstring.h" #include "wrapllerrs.h" #if defined(LL_WINDOWS) @@ -142,8 +143,8 @@ struct PythonProcessLauncher mDesc(desc), mScript("py", script) { - const char* PYTHON(getenv("PYTHON")); - tut::ensure("Set $PYTHON to the Python interpreter", PYTHON); + auto PYTHON(LLStringUtil::getenv("PYTHON")); + tut::ensure("Set $PYTHON to the Python interpreter", !PYTHON.empty()); mParams.desc = desc + " script"; mParams.executable = PYTHON; |