diff options
| author | Geenz <geenz@geenzo.com> | 2013-04-15 19:40:12 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-04-15 19:40:12 -0400 |
| commit | c72c3691ecf83875d4ee3e0784b3e76cb4b4633a (patch) | |
| tree | 7959f729f94b8fcd85bb3b32a7b5bb271c746b47 /indra/llcommon | |
| parent | 39544a3b06e3221602444eb81c7df8c1030c6bb5 (diff) | |
| parent | fafa21315f043ab51e3373e825c85646685778a6 (diff) | |
Merged Graham's stuff amongst others.
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); |