diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-01-17 12:43:28 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-01-17 12:43:28 -0500 |
| commit | d7c8678c3aa46aed09dce6c1edfc196e72d4b428 (patch) | |
| tree | 538a1ef15c2e28676f6a7618bc1e0b5749e2bcea /indra/llcommon/tests/llsdserialize_test.cpp | |
| parent | 9e4b977b2fbb565cef88f3d72e07dbdf8cb2cd69 (diff) | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
merge 5.1.0-release
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); |