common/Unit.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5a12b68b01c786edac804f74c26fd68ae0688139
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Fri Mar 17 12:43:12 2017 +0530
Fix unit test timeout interfering with normal run
Otherwise, loolwsd exits immediately upon start
Change-Id: I3bdf438797be162b8a44bb47ee1ddde7626dcc64
diff --git a/common/Unit.cpp b/common/Unit.cpp
index 687a7abb..ce67207f 100644
--- a/common/Unit.cpp
+++ b/common/Unit.cpp
@@ -189,8 +189,11 @@ void UnitBase::exitTest(TestResult result)
void UnitBase::timeout()
{
- LOG_ERR("Timed out waiting for unit test to complete");
- exitTest(TestResult::TimedOut);
+ if (isUnitTesting())
+ {
+ LOG_ERR("Timed out waiting for unit test to complete");
+ exitTest(TestResult::TimedOut);
+ }
}
void UnitBase::returnValue(int &retValue)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
