loolwsd/LOOLWSD.cpp | 7 ++++++- loolwsd/Unit.cpp | 3 ++- loolwsd/test/Makefile.am | 6 ++---- 3 files changed, 10 insertions(+), 6 deletions(-)
New commits: commit 715b5c0101b76126db1216d4095310c05494b976 Author: Michael Meeks <michael.me...@collabora.com> Date: Fri Oct 21 12:30:35 2016 +0100 Visible user error on unit test timeout. diff --git a/loolwsd/Unit.cpp b/loolwsd/Unit.cpp index 5eb7fb6..e07999c 100644 --- a/loolwsd/Unit.cpp +++ b/loolwsd/Unit.cpp @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <iostream> #include "Unit.hpp" #include "config.h" @@ -164,7 +165,7 @@ void UnitBase::exitTest(TestResult result) void UnitBase::timeout() { - Log::error("Timed out waiting for unit test to complete"); + std::cerr << "Timed out waiting for unit test to complete" << std::endl; exitTest(TestResult::TEST_TIMED_OUT); } commit ae04deada8df952b07b902c5cf4d54fd3aeab10a Author: Michael Meeks <michael.me...@collabora.com> Date: Fri Oct 21 12:30:02 2016 +0100 Restore ability to inject prisoner requests. diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index df9cf2e..12e6438 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -1155,6 +1155,11 @@ public: request, response)) return; + handlePrisonerRequest(request, response); + } + + static void handlePrisonerRequest(HTTPServerRequest& request, HTTPServerResponse& response) + { Log::trace("Child connection with URI [" + request.getURI() + "]."); assert(request.serverAddress().port() == MasterPortNumber); assert(request.getURI().find(NEW_CHILD_URI) == 0); @@ -2004,7 +2009,7 @@ void UnitWSD::testHandleRequest(TestRequest type, UnitHTTPServerRequest& request ClientRequestHandler::handleClientRequest(request, response); break; case TestRequest::TEST_REQ_PRISONER: - // No longer used. Only bridges WSD with child. + PrisonerRequestHandler::handlePrisonerRequest(request, response); break; default: assert(false); commit 15d090a0b09c7ded2356d2384b005dd56a782cd9 Author: Michael Meeks <michael.me...@collabora.com> Date: Fri Oct 21 12:29:18 2016 +0100 Define TDOC globally. diff --git a/loolwsd/test/Makefile.am b/loolwsd/test/Makefile.am index 70c073a..b11b0e2 100644 --- a/loolwsd/test/Makefile.am +++ b/loolwsd/test/Makefile.am @@ -9,7 +9,7 @@ check_PROGRAMS = test noinst_PROGRAMS = test unittest -AM_CXXFLAGS = $(CPPUNIT_CFLAGS) +AM_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTDOC=\"$(top_srcdir)/test/data\" noinst_LTLIBRARIES = \ unit-timeout.la unit-prefork.la \ @@ -37,7 +37,7 @@ wsd_sources = \ ../Unit.cpp \ ../Util.cpp -test_CPPFLAGS = -DTDOC=\"$(abs_top_srcdir)/test/data\" -I$(top_srcdir) -DBUILDING_TESTS +test_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS test_SOURCES = TileCacheTests.cpp integration-http-server.cpp \ httpwstest.cpp httpcrashtest.cpp httpwserror.cpp test.cpp $(wsd_sources) test_LDADD = $(CPPUNIT_LIBS) @@ -50,13 +50,11 @@ unittest_LDADD = $(CPPUNIT_LIBS) unit_fuzz_la_SOURCES = UnitFuzz.cpp unit_admin_la_SOURCES = UnitAdmin.cpp unit_admin_la_LIBADD = $(CPPUNIT_LIBS) -unit_admin_la_CPPFLAGS = -DTDOC=\"$(top_srcdir)/test/data\" unit_fonts_la_SOURCES = UnitFonts.cpp unit_timeout_la_SOURCES = UnitTimeout.cpp unit_prefork_la_SOURCES = UnitPrefork.cpp unit_storage_la_SOURCES = UnitStorage.cpp unit_tilecache_la_SOURCES = UnitTileCache.cpp -unit_tilecache_la_CPPFLAGS = -DTDOC=\"$(top_srcdir)/test/data\" if HAVE_LO_PATH SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits