loolwsd/LOOLWSD.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
New commits: commit 8a10a16855534c1d41a138ea66e881cf3a16bbc1 Author: Henry Castro <[email protected]> Date: Fri Sep 11 16:31:43 2015 -0400 loolwsd: restore interactive testing diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 0b12474..e12cbf4 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -1114,7 +1114,15 @@ int LOOLWSD::main(const std::vector<std::string>& args) _namedMutexLOOL.unlock(); - while (MasterProcessSession::_childProcesses.size() > 0) + TestInput input(*this, svs, srv); + Thread inputThread; + if (LOOLWSD::doTest) + { + inputThread.start(input); + waitForTerminationRequest(); + } + + while (!LOOLWSD::doTest && MasterProcessSession::_childProcesses.size() > 0) { int status; pid_t pid = waitpid(-1, &status, WUNTRACED | WNOHANG); @@ -1156,6 +1164,9 @@ int LOOLWSD::main(const std::vector<std::string>& args) } } + if (LOOLWSD::doTest) + inputThread.join(); + // Terminate child processes for (auto i : MasterProcessSession::_childProcesses) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
