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/llleap_test.cpp | |
| parent | 2d3b805b949a294d3f298eb3d786aac777ebb51e (diff) | |
| parent | 0d27cb37bfea618896b0b4c5a422880e1a882210 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/vir-fixes
Diffstat (limited to 'indra/llcommon/tests/llleap_test.cpp')
| -rw-r--r-- | indra/llcommon/tests/llleap_test.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp index c387da6c48..45648536c4 100644 --- a/indra/llcommon/tests/llleap_test.cpp +++ b/indra/llcommon/tests/llleap_test.cpp @@ -26,6 +26,7 @@ #include "wrapllerrs.h" #include "llevents.h" #include "llprocess.h" +#include "llstring.h" #include "stringize.h" #include "StringVec.h" #include <functional> @@ -198,14 +199,12 @@ namespace tut // basename. reader_module(LLProcess::basename( reader.getName().substr(0, reader.getName().length()-3))), - pPYTHON(getenv("PYTHON")), - PYTHON(pPYTHON? pPYTHON : "") + PYTHON(LLStringUtil::getenv("PYTHON")) { - ensure("Set PYTHON to interpreter pathname", pPYTHON); + ensure("Set PYTHON to interpreter pathname", !PYTHON.empty()); } NamedExtTempFile reader; const std::string reader_module; - const char* pPYTHON; const std::string PYTHON; }; typedef test_group<llleap_data> llleap_group; |