diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-04-10 10:23:54 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-04-10 10:23:54 -0700 |
| commit | 72f6017dc245af1a72ce82c5d3a28904e08cd2a4 (patch) | |
| tree | 04b78e6dd6752fa83146bbe68a7b7357214f3bf9 /indra/llcommon | |
| parent | 6a417acd63d576271a8b752e42a79156dd8bdc27 (diff) | |
| parent | 8f84d75ae42f4bb6f3305c64e95bc4a070b774a6 (diff) | |
Merge
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/tests/llprocess_test.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp index 6f1e7d46b8..f188865eb0 100644 --- a/indra/llcommon/tests/llprocess_test.cpp +++ b/indra/llcommon/tests/llprocess_test.cpp @@ -969,10 +969,7 @@ namespace tut childout.getline(), "ok"); // important to get the implicit flush from std::endl py.mPy->getWritePipe().get_ostream() << "go" << std::endl; - for (i = 0; i < timeout && py.mPy->isRunning() && ! childout.contains("\n"); ++i) - { - yield(); - } + waitfor(*py.mPy); ensure("script never replied", childout.contains("\n")); ensure_equals("child didn't ack", childout.getline(), "ack"); ensure_equals("bad child termination", py.mPy->getStatus().mState, LLProcess::EXITED); |