summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestcase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/testlib/qtestcase.cpp')
-rw-r--r--src/testlib/qtestcase.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 63c6ef92af..e42c776353 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -85,7 +85,6 @@
#include <cmath>
#include <numeric>
#include <algorithm>
-#include <condition_variable>
#include <mutex>
#include <chrono>
@@ -1023,7 +1022,8 @@ class WatchDog : public QThread
ThreadEnd,
};
- bool waitFor(std::unique_lock<QtPrivate::mutex> &m, Expectation e) {
+ bool waitFor(std::unique_lock<QtPrivate::mutex> &m, Expectation e)
+ {
auto expectationChanged = [this, e] { return expecting.load(std::memory_order_relaxed) != e; };
switch (e) {
case TestFunctionEnd:
@@ -1047,7 +1047,9 @@ public:
start();
waitFor(locker, ThreadStart);
}
- ~WatchDog() {
+
+ ~WatchDog()
+ {
{
const auto locker = qt_scoped_lock(mutex);
expecting.store(ThreadEnd, std::memory_order_relaxed);
@@ -1056,19 +1058,22 @@ public:
wait();
}
- void beginTest() {
+ void beginTest()
+ {
const auto locker = qt_scoped_lock(mutex);
expecting.store(TestFunctionEnd, std::memory_order_relaxed);
waitCondition.notify_all();
}
- void testFinished() {
+ void testFinished()
+ {
const auto locker = qt_scoped_lock(mutex);
expecting.store(TestFunctionStart, std::memory_order_relaxed);
waitCondition.notify_all();
}
- void run() override {
+ void run() override
+ {
auto locker = qt_unique_lock(mutex);
expecting.store(TestFunctionStart, std::memory_order_release);
waitCondition.notify_all();