summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@viroteck.net>2014-08-19 15:05:02 +0200
committerRobin Burchell <robin.burchell@viroteck.net>2014-08-19 18:51:44 +0200
commit2e2374a226862ffbda493d06152d3b77b93e564e (patch)
tree78f51eda860b395fa5df6d5bfe65abad73ea1844 /tests/auto
parent36a30d8e49def2999917bb12489dcbfbbfa99209 (diff)
tst_qsqlthread: Replace sched_yield calls with QThread::yieldCurrentThread.
Makes the test behavior identical across all platforms. Change-Id: I5e564598d8e61588af2b73f04b4ca7c9b899c02a Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
index 881f2b5c7c..61b4305d13 100644
--- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
@@ -49,10 +49,6 @@
#include <QtSql>
#include "qdebug.h"
-#ifdef Q_OS_LINUX
-#include <sched.h>
-#endif
-
const QString qtest(qTableName("qtest", __FILE__, QSqlDatabase()));
// set this define if Oracle is built with threading support
//#define QOCI_THREADED
@@ -158,9 +154,7 @@ public:
q.bindValue(1, "threaddy");
q.bindValue(2, 10);
QVERIFY_SQL(q, exec());
-#ifdef Q_OS_LINUX
- sched_yield();
-#endif
+ QThread::yieldCurrentThread();
}
}
@@ -196,9 +190,7 @@ public:
q2.bindValue("id", q1.value(0));
q1.clear();
QVERIFY_SQL(q2, exec());
-#ifdef Q_OS_LINUX
- sched_yield();
-#endif
+ QThread::yieldCurrentThread();
}
}