1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QTestLib: Fix QFINDTESTDATA for Windows.

Browse Source 
- Scan the parent directory of the executable if it is located
  in a 'Debug' or 'Release' directory
- Report with native separators in the log.
- Use the QString::arg() overloads with several string parameters.

Change-Id: I5ea84411e12978f8f958a0bce3ae10da44cc4e3f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
This commit is contained in:
Friedemann Kleint 2011-12-20 09:43:24 +01:00 committed by Qt by Nokia
parent f1e07483b3
commit 5d4acbab0e
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/testlib/qtestcase.cpp
View File

@ -2102,6 +2102,15 @@ void QTest::ignoreMessage(QtMsgType type, const char *message)
/*! \internal /*! \internal
*/ */
#ifdef Q_OS_WIN
static inline bool isWindowsBuildDirectory(const QString &dirName)
{
return dirName.compare(QStringLiteral("Debug"), Qt::CaseInsensitive) == 0
|| dirName.compare(QStringLiteral("Release"), Qt::CaseInsensitive) == 0;
}
#endif
QString QTest::qFindTestData(const QString& base, const char *file, int line, const char *builddir) QString QTest::qFindTestData(const QString& base, const char *file, int line, const char *builddir)
{ {
QString found; QString found;
@ -2110,16 +2119,23 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
// 1. relative to test binary. // 1. relative to test binary.
if (qApp) { if (qApp) {
QString binpath = QCoreApplication::applicationDirPath(); QDir binDirectory(QCoreApplication::applicationDirPath());
QString candidate = QString::fromLatin1("%1/%2").arg(binpath).arg(base); if (binDirectory.exists(base)) {
if (QFileInfo(candidate).exists()) { found = binDirectory.absoluteFilePath(base);
found = candidate;
} }
#ifdef Q_OS_WIN
// Windows: The executable is typically located in one of the
// 'Release' or 'Debug' directories.
else if (isWindowsBuildDirectory(binDirectory.dirName())
&& binDirectory.cdUp() && binDirectory.exists(base)) {
found = binDirectory.absoluteFilePath(base);
}
#endif // Q_OS_WIN
else if (QTestLog::verboseLevel() >= 2) { else if (QTestLog::verboseLevel() >= 2) {
const QString candidate = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + QLatin1Char('/') + base);
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found relative to test binary [%2]; " QString::fromLatin1("testdata %1 not found relative to test binary [%2]; "
"checking next location") "checking next location").arg(base, candidate)),
.arg(base).arg(candidate)),
file, line); file, line);
} }
} }
@ -2130,9 +2146,7 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
if (testObjectName) { if (testObjectName) {
QString testsPath = QLibraryInfo::location(QLibraryInfo::TestsPath); QString testsPath = QLibraryInfo::location(QLibraryInfo::TestsPath);
QString candidate = QString::fromLatin1("%1/%2/%3") QString candidate = QString::fromLatin1("%1/%2/%3")
.arg(testsPath) .arg(testsPath, QFile::decodeName(testObjectName).toLower(), base);
.arg(QFile::decodeName(testObjectName).toLower())
.arg(base);
if (QFileInfo(candidate).exists()) { if (QFileInfo(candidate).exists()) {
found = candidate; found = candidate;
} }
@ -2140,7 +2154,7 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found in tests install path [%2]; " QString::fromLatin1("testdata %1 not found in tests install path [%2]; "
"checking next location") "checking next location")
.arg(base).arg(candidate)), .arg(base, QDir::toNativeSeparators(candidate))),
file, line); file, line);
} }
} }
@ -2157,14 +2171,14 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
srcdir.setFile(QFile::decodeName(builddir) + QLatin1String("/") + srcdir.filePath()); srcdir.setFile(QFile::decodeName(builddir) + QLatin1String("/") + srcdir.filePath());
} }
QString candidate = QString::fromLatin1("%1/%2").arg(srcdir.canonicalFilePath()).arg(base); QString candidate = QString::fromLatin1("%1/%2").arg(srcdir.canonicalFilePath(), base);
if (QFileInfo(candidate).exists()) { if (QFileInfo(candidate).exists()) {
found = candidate; found = candidate;
} }
else if (QTestLog::verboseLevel() >= 2) { else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found relative to source path [%2]") QString::fromLatin1("testdata %1 not found relative to source path [%2]")
.arg(base).arg(candidate)), .arg(base, QDir::toNativeSeparators(candidate))),
file, line); file, line);
} }
} }
@ -2176,7 +2190,7 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
} }
else if (QTestLog::verboseLevel() >= 1) { else if (QTestLog::verboseLevel() >= 1) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 was located at %2").arg(base).arg(found)), QString::fromLatin1("testdata %1 was located at %2").arg(base, QDir::toNativeSeparators(found))),
file, line); file, line);
} }