Skip to content

Commit 926fc34

Browse files
committed
minor adjustments for mac/unix
1 parent 547bc8e commit 926fc34

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

Tests/UpdaterTest/testmanager.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ TestManager::TestManager(const QString &testProgramPath) :
1010
passCount(0),
1111
failCount(0),
1212
activeProcesses()
13-
{}
13+
{
14+
if(!QMetaType::isRegistered(QMetaType::type("QProcess::ProcessError")))
15+
qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
16+
if(!QMetaType::isRegistered(QMetaType::type("QProcess::ExitStatus")))
17+
qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
18+
}
1419

1520
void TestManager::addSequentialTest(const QString &testName, const QString &testData)
1621
{
@@ -133,9 +138,11 @@ void TestManager::runNextGroup()
133138
proc->setArguments(info.arguments);
134139

135140
connect(proc, SIGNAL(finished(int,QProcess::ExitStatus)),
136-
this, SLOT(processReady(int,QProcess::ExitStatus)));
141+
this, SLOT(processReady(int,QProcess::ExitStatus)),
142+
Qt::QueuedConnection);
137143
connect(proc, SIGNAL(error(QProcess::ProcessError)),
138-
this, SLOT(processError(QProcess::ProcessError)));
144+
this, SLOT(processError(QProcess::ProcessError)),
145+
Qt::QueuedConnection);
139146

140147
this->activeProcesses.insert(proc, info);
141148
proc->start(QIODevice::ReadOnly);

Tests/UpdaterTest/tst_updatertest.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,16 @@ void setup(TestManager *manager)
326326
manager->addParallelTest("testScheduler", "UpdateTaskList");
327327

328328
manager->addParallelTest("testUpdaterInitState");
329+
#if defined(Q_OS_WIN)
329330
manager->addParallelTest("testUpdateCheck", "C:/Program Files/IcoDroid");
330331
manager->addParallelTest("testUpdateCheck", "C:/Qt");
332+
#elif defined(Q_OS_OSX)
333+
manager->addParallelTest("testUpdateCheck", "/Applications/IcoDroid.app");
334+
manager->addParallelTest("testUpdateCheck", "/Users/sky/Qt");
335+
#elif defined(Q_OS_UNIX)
336+
manager->addParallelTest("testUpdateCheck", "/home/sky/IcoDroid");
337+
manager->addParallelTest("testUpdateCheck", "/home/sky/Qt");
338+
#endif
331339

332340
manager->addSequentialTest("testSchedulerSave");
333341
}

0 commit comments

Comments
 (0)