AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use jom in tst_qmake.

Browse Source 
Speed up compiling the tests.

Task-number: 26023

Change-Id: Ib5e872cc6cde09ac90f426a8f6e7cfea509d02e2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Friedemann Kleint 2012-10-05 10:12:08 +02:00 committed by The Qt Project
parent 8924506992
commit 274c258521
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/tools/qmake/tst_qmake.cpp
View File

@ -44,6 +44,7 @@
#include "testcompiler.h" #include "testcompiler.h"
#include <QObject> #include <QObject>
#include <QStandardPaths>
#include <QDir> #include <QDir>
class tst_qmake : public QObject class tst_qmake : public QObject
@ -111,7 +112,12 @@ void tst_qmake::initTestCase()
QString binpath = QLibraryInfo::location(QLibraryInfo::BinariesPath); QString binpath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
QString cmd = QString("%1/qmake").arg(binpath); QString cmd = QString("%1/qmake").arg(binpath);
#ifdef Q_CC_MSVC #ifdef Q_CC_MSVC
test_compiler.setBaseCommands( "nmake", cmd ); const QString jom = QStandardPaths::findExecutable(QLatin1String("jom.exe"));
if (jom.isEmpty()) {
test_compiler.setBaseCommands( QLatin1String("nmake"), cmd );
} else {
test_compiler.setBaseCommands( jom, cmd );
}
#elif defined(Q_CC_MINGW) #elif defined(Q_CC_MINGW)
test_compiler.setBaseCommands( "mingw32-make", cmd ); test_compiler.setBaseCommands( "mingw32-make", cmd );
#elif defined(Q_OS_WIN) && defined(Q_CC_GNU) #elif defined(Q_OS_WIN) && defined(Q_CC_GNU)