summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/uic/tst_uic.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-26 14:22:45 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-27 06:12:17 +0200
commitaf8795c2b5305cf92df3249c6bd3cc6292415d8f (patch)
tree8702ac0fa4cc34acb91d735829058c8adc95cde4 /tests/auto/tools/uic/tst_uic.cpp
parent238c3046134cf184c642d75e69fc2fb85a29e057 (diff)
Remove unreachable QSKIP in UIC autotest.
If an autotest's initTestCase() method fails or skips, the remaining test functions are not executed. Thus the QSKIP in the run() test function was unreachable. Change-Id: If1f1b484958367236357f9445491bed50bee2239 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/tools/uic/tst_uic.cpp')
-rw-r--r--tests/auto/tools/uic/tst_uic.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp
index 2d77cb3c75..3244e584f5 100644
--- a/tests/auto/tools/uic/tst_uic.cpp
+++ b/tests/auto/tools/uic/tst_uic.cpp
@@ -68,15 +68,12 @@ private Q_SLOTS:
private:
QString workingDir() const;
-private:
- bool uicExists;
const QString command;
};
tst_uic::tst_uic()
- : uicExists(true)
- , command(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/uic"))
+ : command(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/uic"))
{
}
@@ -86,7 +83,6 @@ void tst_uic::initTestCase()
process.start(command, QStringList(QLatin1String("-help")));
if (!process.waitForFinished()) {
- uicExists = false;
const QString path = QString::fromLocal8Bit(qgetenv("PATH"));
QString message = QString::fromLatin1("'%1' could not be found when run from '%2'. Path: '%3' ").
arg(command, QDir::currentPath(), path);
@@ -109,9 +105,6 @@ void tst_uic::initTestCase()
void tst_uic::run()
{
- if (!uicExists)
- QSKIP("uic not found in the path...");
-
QFETCH(QString, originalFile);
QFETCH(QString, generatedFile);