summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/Makefile.am2
-rw-r--r--test/UnitPrefork.cpp5
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