diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2017-05-12 08:18:22 -0700 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2017-05-12 08:18:22 -0700 |
commit | 9b3166ffc0cb3a686ea1f3007110976fbf81ea1c (patch) | |
tree | 5884820ab4bd08b66d9ba28c134feef197131038 /indra/llcommon/tests/llsdserialize_test.cpp | |
parent | 1dcc9e3e1163b93d7654fc776d8e81252f15a6e1 (diff) | |
parent | b92ab8f7e659de66140cc6f538c74c1fc81e6a73 (diff) |
pull from v64 gate
Diffstat (limited to 'indra/llcommon/tests/llsdserialize_test.cpp')
-rw-r--r-- | indra/llcommon/tests/llsdserialize_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp index 81b930e1e2..8836230640 100644 --- a/indra/llcommon/tests/llsdserialize_test.cpp +++ b/indra/llcommon/tests/llsdserialize_test.cpp @@ -1553,7 +1553,7 @@ namespace tut params.executable = PYTHON; params.args.add(scriptfile.getName()); LLProcessPtr py(LLProcess::create(params)); - ensure(STRINGIZE("Couldn't launch " << desc << " script"), py); + ensure(STRINGIZE("Couldn't launch " << desc << " script"), bool(py)); // Implementing timeout would mean messing with alarm() and // catching SIGALRM... later maybe... int status(0); |