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

Remove unreachable QSKIP in UIC autotest.

Browse Source 
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>
This commit is contained in:
Jason McDonald 2011-10-26 14:22:45 +10:00 committed by Qt by Nokia
parent 238c304613
commit af8795c2b5
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/tools/uic/tst_uic.cpp
View File

@ -68,15 +68,12 @@ private Q_SLOTS:
private: private:
QString workingDir() const; QString workingDir() const;
private:
bool uicExists;
const QString command; const QString command;
}; };
tst_uic::tst_uic() 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"))); process.start(command, QStringList(QLatin1String("-help")));
if (!process.waitForFinished()) { if (!process.waitForFinished()) {
uicExists = false;
const QString path = QString::fromLocal8Bit(qgetenv("PATH")); const QString path = QString::fromLocal8Bit(qgetenv("PATH"));
QString message = QString::fromLatin1("'%1' could not be found when run from '%2'. Path: '%3' "). QString message = QString::fromLatin1("'%1' could not be found when run from '%2'. Path: '%3' ").
arg(command, QDir::currentPath(), path); arg(command, QDir::currentPath(), path);
@ -109,9 +105,6 @@ void tst_uic::initTestCase()
void tst_uic::run() void tst_uic::run()
{ {
if (!uicExists)
QSKIP("uic not found in the path...");
QFETCH(QString, originalFile); QFETCH(QString, originalFile);
QFETCH(QString, generatedFile); QFETCH(QString, generatedFile);