feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tests: Fix sdktool test

Browse Source 
Change-Id: Idc21354d3f546c1aaff7d1481c80190c6c1c366c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2015-11-26 17:56:55 +01:00
parent f7ab95247b
commit ce2a891c48
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/sdktool/sdktool.pro
View File

@@ -1,3 +1,5 @@
include(../qttest.pri) include(../qttest.pri)
DEFINES += "SDKTOOL_DIR=\\\"$$IDE_LIBEXEC_PATH\\\""
SOURCES += tst_sdktool.cpp SOURCES += tst_sdktool.cpp

2
tests/auto/sdktool/sdktool.qbs
View File

@@ -7,4 +7,6 @@ QtcAutotest {
name: "Test sources" name: "Test sources"
files: "tst_sdktool.cpp" files: "tst_sdktool.cpp"
} }
cpp.defines: base.concat(['SDKTOOL_DIR="' + qbs.installRoot + '/' + project.ide_libexec_path + '"'])
} }

6
tests/auto/sdktool/tst_sdktool.cpp
View File

@@ -43,11 +43,7 @@ private slots:
void SdktoolTest::testSdktool() void SdktoolTest::testSdktool()
{ {
QDir rootDir = QCoreApplication::applicationDirPath(); QDir rootDir(SDKTOOL_DIR);
rootDir.cdUp();
rootDir.cdUp();
rootDir.cdUp();
rootDir.cd(QLatin1String("bin"));
QProcess process; QProcess process;
process.start(rootDir.absoluteFilePath(QLatin1String("sdktool")), process.start(rootDir.absoluteFilePath(QLatin1String("sdktool")),
QStringList() << QLatin1String("-test")); QStringList() << QLatin1String("-test"));