diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-02-23 16:54:34 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-02-23 16:54:34 -0500 |
| commit | 1f2fcc12980dd21659bce493431b7a1b3fe2ef00 (patch) | |
| tree | 7a678b096eaa89f655c7e74fb2aacf57b38afe77 /indra/llcommon/tests/llsdserialize_test.cpp | |
| parent | f0b256b1cb6c96aed81ee456e505247fd2169c5f (diff) | |
| parent | ae0b3149badf369eb2b1f10aba830eef8b4af9b4 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-c-11
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); |