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

winrt: Make test functional

Browse Source 
The adoptedThreads test never spawned any thread causing a test error
later on. Hence add a winrt version using __beginthreadex which exists
for that platform.

Change-Id: I04f980218713df20cb41d804d732e0c99b958489
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Maurice Kalinowski 2016-08-09 13:46:42 +02:00
parent 7305b3e828
commit bd79c4e28c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
View File

@ -200,6 +200,13 @@ void testAdoptedThreadStorageWin(void *p)
} }
QObject::connect(QThread::currentThread(), SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); QObject::connect(QThread::currentThread(), SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
} }
#ifdef Q_OS_WINRT
unsigned __stdcall testAdoptedThreadStorageWinRT(void *p)
{
testAdoptedThreadStorageWin(p);
return 0;
}
#endif
void *testAdoptedThreadStorageUnix(void *pointers) void *testAdoptedThreadStorageUnix(void *pointers)
{ {
testAdoptedThreadStorageWin(pointers); testAdoptedThreadStorageWin(pointers);
@ -217,7 +224,12 @@ void tst_QThreadStorage::adoptedThreads()
const int state = pthread_create(&thread, 0, testAdoptedThreadStorageUnix, &pointers); const int state = pthread_create(&thread, 0, testAdoptedThreadStorageUnix, &pointers);
QCOMPARE(state, 0); QCOMPARE(state, 0);
pthread_join(thread, 0); pthread_join(thread, 0);
#elif defined Q_OS_WIN && !defined(Q_OS_WINRT) #elif defined Q_OS_WINRT
HANDLE thread;
thread = (HANDLE) _beginthreadex(NULL, 0, testAdoptedThreadStorageWinRT, &pointers, 0, 0);
QVERIFY(thread);
WaitForSingleObjectEx(thread, INFINITE, FALSE);
#elif defined Q_OS_WIN
HANDLE thread; HANDLE thread;
thread = (HANDLE)_beginthread(testAdoptedThreadStorageWin, 0, &pointers); thread = (HANDLE)_beginthread(testAdoptedThreadStorageWin, 0, &pointers);
QVERIFY(thread); QVERIFY(thread);