1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_qsqlthread: Replace sched_yield calls with QThread::yieldCurrentThread.

Browse Source 
Makes the test behavior identical across all platforms.

Change-Id: I5e564598d8e61588af2b73f04b4ca7c9b899c02a
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Robin Burchell 2014-08-19 15:05:02 +02:00
parent 36a30d8e49
commit 2e2374a226
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
View File

@ -49,10 +49,6 @@
#include <QtSql> #include <QtSql>
#include "qdebug.h" #include "qdebug.h"
#ifdef Q_OS_LINUX
#include <sched.h>
#endif
const QString qtest(qTableName("qtest", __FILE__, QSqlDatabase())); const QString qtest(qTableName("qtest", __FILE__, QSqlDatabase()));
// set this define if Oracle is built with threading support // set this define if Oracle is built with threading support
//#define QOCI_THREADED //#define QOCI_THREADED
@ -158,9 +154,7 @@ public:
q.bindValue(1, "threaddy"); q.bindValue(1, "threaddy");
q.bindValue(2, 10); q.bindValue(2, 10);
QVERIFY_SQL(q, exec()); QVERIFY_SQL(q, exec());
#ifdef Q_OS_LINUX QThread::yieldCurrentThread();
sched_yield();
#endif
} }
} }
@ -196,9 +190,7 @@ public:
q2.bindValue("id", q1.value(0)); q2.bindValue("id", q1.value(0));
q1.clear(); q1.clear();
QVERIFY_SQL(q2, exec()); QVERIFY_SQL(q2, exec());
#ifdef Q_OS_LINUX QThread::yieldCurrentThread();
sched_yield();
#endif
} }
} }