From af8795c2b5305cf92df3249c6bd3cc6292415d8f Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 26 Oct 2011 14:22:45 +1000 Subject: [PATCH] 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 --- tests/auto/tools/uic/tst_uic.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp index 2d77cb3..3244e58 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); -- 2.7.4