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

QTestLib: Remove valgrind version check.

Browse Source 
Version 3.3 is now assumed to be widely available.

Task-number: QTBUG-41453
Change-Id: I453ce26d170b2bbb8179ddf4b91155ddd3e6379a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
This commit is contained in:
Friedemann Kleint 2014-10-14 11:45:36 +02:00
parent 65b563fe57
commit 7095cdabc9
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/testlib/qbenchmarkvalgrind.cpp
View File

@ -45,33 +45,15 @@
QT_BEGIN_NAMESPACE
// Returns \c true iff a sufficiently recent valgrind is available.
// Returns \c true if valgrind is available.
bool QBenchmarkValgrindUtils::haveValgrind()
{
#ifdef NVALGRIND
return false;
#else
QProcess process;
QStringList args;
args << QLatin1String("--version");
process.start(QLatin1String("valgrind"), args);
if (!process.waitForFinished(-1))
return false;
const QByteArray out = process.readAllStandardOutput();
QRegExp rx(QLatin1String("^valgrind-([0-9]+).([0-9]+).[0-9]+"));
if (rx.indexIn(QLatin1String(out.data())) == -1)
return false;
bool ok;
const int major = rx.cap(1).toInt(&ok);
if (!ok)
return false;
const int minor = rx.cap(2).toInt(&ok);
if (!ok)
return false;
// return (major > 3 || (major == 3 && minor >= 3)); // v >= 3.3 for --callgrind-out-file option
Q_UNUSED(major);
Q_UNUSED(minor);
return true; // skip version restriction for now
process.start(QLatin1String("valgrind"), QStringList(QLatin1String("--version")));
return process.waitForStarted() && process.waitForFinished(-1);
#endif
}