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

Testlib.selftest: Improve process execution, run on openSUSE.

Browse Source 
Give processes a more complete environment (openSUSE
requires more variables to start an X11-process),
add test column indicating whether a test is
supposed to crash. If it is not, report crash reason.

Change-Id: I1e0ad59824963f69ee425f331d845741be2b3928
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
This commit is contained in:
Friedemann Kleint 2013-11-18 22:43:19 +01:00 committed by The Qt Project
parent 1f22d924e8
commit 1b9be3f481
1 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
tests/auto/testlib/selftests/tst_selftests.cpp
View File

@ -63,7 +63,7 @@ private slots:
void cleanup(); void cleanup();
private: private:
void doRunSubTest(QString const& subdir, QStringList const& loggers, QStringList const& arguments); void doRunSubTest(QString const& subdir, QStringList const& loggers, QStringList const& arguments, bool crashes);
QString logName(const QString &logger) const; QString logName(const QString &logger) const;
QList<LoggerSet> allLoggerSets() const; QList<LoggerSet> allLoggerSets() const;
@ -324,6 +324,7 @@ void tst_Selftests::runSubTest_data()
QTest::addColumn<QString>("subdir"); QTest::addColumn<QString>("subdir");
QTest::addColumn<QStringList>("loggers"); QTest::addColumn<QStringList>("loggers");
QTest::addColumn<QStringList>("arguments"); QTest::addColumn<QStringList>("arguments");
QTest::addColumn<bool>("crashes");
QStringList tests = QStringList() QStringList tests = QStringList()
// << "alive" // timer dependent // << "alive" // timer dependent
@ -479,11 +480,14 @@ void tst_Selftests::runSubTest_data()
continue; continue;
} }
} }
const bool crashes = subtest == QLatin1String("assert") || subtest == QLatin1String("exceptionthrow")
|| subtest == QLatin1String("fetchbogus") || subtest == QLatin1String("crashedterminate")
|| subtest == QLatin1String("crashes") || subtest == QLatin1String("silent");
QTest::newRow(qPrintable(QString("%1 %2").arg(subtest).arg(loggerSet.name))) QTest::newRow(qPrintable(QString("%1 %2").arg(subtest).arg(loggerSet.name)))
<< subtest << subtest
<< loggers << loggers
<< arguments << arguments
<< crashes
; ;
} }
} }
@ -491,30 +495,41 @@ void tst_Selftests::runSubTest_data()
#ifndef QT_NO_PROCESS #ifndef QT_NO_PROCESS
static void insertEnvironmentVariable(QString const& name, QProcessEnvironment &result) static QProcessEnvironment processEnvironment()
{ {
const QProcessEnvironment systemEnvironment = QProcessEnvironment::systemEnvironment(); static QProcessEnvironment result;
const QString value = systemEnvironment.value(name); if (result.isEmpty()) {
if (!value.isEmpty()) const QProcessEnvironment systemEnvironment = QProcessEnvironment::systemEnvironment();
result.insert(name, value); foreach (const QString &key, systemEnvironment.keys()) {
} const bool useVariable = key == QLatin1String("PATH") || key == QLatin1String("QT_QPA_PLATFORM")
#ifdef Q_OS_UNIX
static inline QProcessEnvironment processEnvironment() || key == QLatin1String("HOME") || key == QLatin1String("USER") // Required for X11 on openSUSE
{ # ifndef Q_OS_MAC
QProcessEnvironment result; || key == QLatin1String("DISPLAY") || key == QLatin1String("XAUTHLOCALHOSTNAME")
insertEnvironmentVariable(QStringLiteral("PATH"), result); || key.startsWith(QLatin1String("XDG_"))
// Preserve DISPLAY for X11 as some tests use Qt GUI. # endif // !Q_OS_MAC
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) #endif // Q_OS_UNIX
insertEnvironmentVariable(QStringLiteral("DISPLAY"), result);
#endif
insertEnvironmentVariable(QStringLiteral("QT_QPA_PLATFORM"), result);
#ifdef __COVERAGESCANNER__ #ifdef __COVERAGESCANNER__
insertEnvironmentVariable(QStringLiteral("QT_TESTCOCOON_ACTIVE"), result); || key == QLatin1String("QT_TESTCOCOON_ACTIVE")
#endif #endif
;
if (useVariable)
result.insert(key, systemEnvironment.value(key));
}
}
return result; return result;
} }
void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& loggers, QStringList const& arguments) static inline QByteArray msgProcessError(const QString &binary, const QStringList &args,
const QProcessEnvironment &e, const QString &what)
{
QString result;
QTextStream(&result) <<"Error running " << binary << ' ' << args.join(' ')
<< " with environment " << e.toStringList().join(' ') << ": " << what;
return result.toLocal8Bit();
}
void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& loggers, QStringList const& arguments, bool crashes)
{ {
#if defined(__GNUC__) && defined(__i386) && defined(Q_OS_LINUX) #if defined(__GNUC__) && defined(__i386) && defined(Q_OS_LINUX)
if (arguments.contains("-callgrind")) { if (arguments.contains("-callgrind")) {
@ -532,8 +547,14 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge
proc.setProcessEnvironment(environment); proc.setProcessEnvironment(environment);
const QString path = subdir + QLatin1Char('/') + subdir; const QString path = subdir + QLatin1Char('/') + subdir;
proc.start(path, arguments); proc.start(path, arguments);
QVERIFY2(proc.waitForStarted(), qPrintable(QString::fromLatin1("Cannot start '%1': %2").arg(path, proc.errorString()))); QVERIFY2(proc.waitForStarted(), msgProcessError(path, arguments, environment, QStringLiteral("Cannot start: ") + proc.errorString()));
QVERIFY2(proc.waitForFinished(), qPrintable(proc.errorString())); QVERIFY2(proc.waitForFinished(), msgProcessError(path, arguments, environment, QStringLiteral("Timed out: ") + proc.errorString()));
if (!crashes) {
QVERIFY2(proc.exitStatus() == QProcess::NormalExit,
msgProcessError(path, arguments, environment,
QStringLiteral("Crashed: ") + proc.errorString()
+ QStringLiteral(": ") + QString::fromLocal8Bit(proc.readAllStandardError())));
}
QList<QByteArray> actualOutputs; QList<QByteArray> actualOutputs;
for (int i = 0; i < loggers.count(); ++i) { for (int i = 0; i < loggers.count(); ++i) {
@ -700,8 +721,9 @@ void tst_Selftests::runSubTest()
QFETCH(QString, subdir); QFETCH(QString, subdir);
QFETCH(QStringList, loggers); QFETCH(QStringList, loggers);
QFETCH(QStringList, arguments); QFETCH(QStringList, arguments);
QFETCH(bool, crashes);
doRunSubTest(subdir, loggers, arguments); doRunSubTest(subdir, loggers, arguments, crashes);
#endif // !QT_NO_PROCESS #endif // !QT_NO_PROCESS
} }