diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2017-03-30 21:55:33 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2017-03-30 21:59:05 +0100 |
commit | f20e931b29ebea0778e72892c9357ef9ae809557 (patch) | |
tree | 4d977448640f6d99c856d1018e8b988a785d6d1b /test | |
parent | Improve debugging information. (diff) | |
download | online-f20e931b29ebea0778e72892c9357ef9ae809557.tar.gz online-f20e931b29ebea0778e72892c9357ef9ae809557.zip |
Re-enable UnitPrefork.
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile.am | 2 | ||||
-rw-r--r-- | test/UnitPrefork.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index c55c306fbc..9008efa162 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -74,7 +74,7 @@ check-local: ./run_unit.sh --log-file test.log --trs-file test.trs # FIXME 2: unit-oob.la fails with symbol undefined: # UnitWSD::testHandleRequest(UnitWSD::TestRequest, UnitHTTPServerRequest&, UnitHTTPServerResponse&) , -TESTS = # unit-prefork.la # unit-tilecache.la unit-storage.la unit-timeout.la unit-admin.la unit-minsocketbuffersize.la +TESTS = unit-prefork.la # unit-tilecache.la unit-storage.la unit-timeout.la unit-admin.la unit-minsocketbuffersize.la else TESTS = ${top_builddir}/test/test endif diff --git a/test/UnitPrefork.cpp b/test/UnitPrefork.cpp index 841fbd3787..90852a6999 100644 --- a/test/UnitPrefork.cpp +++ b/test/UnitPrefork.cpp @@ -27,9 +27,10 @@ public: setTimeout(60 * 1000); } - virtual void configure(Poco::Util::LayeredConfiguration& /* config */) override + virtual void configure(Poco::Util::LayeredConfiguration& config) override { - LOOLWSD::NumPreSpawnedChildren = NumToPrefork; + config.setInt("num_prespawn_children", NumToPrefork); + UnitWSD::configure(config); } virtual void newChild(WebSocketHandler &) override |