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

Disable core dumps for selftests that are meant to be crashing

Browse Source 
Task-number: QTBUG-55155
Change-Id: I26a1461f35f916f3980fcb18cdddf3502e22fc90
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Tor Arne Vestbø 2016-12-08 14:07:25 +01:00
parent 50cb2687b2
commit aec85a53df
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/testlib/qtestcase.cpp
View File

@ -99,6 +99,7 @@
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <time.h> #include <time.h>
#include <sys/resource.h>
#endif #endif
#if defined(Q_OS_MACX) #if defined(Q_OS_MACX)
@ -143,6 +144,22 @@ static bool debuggerPresent()
#endif #endif
} }
static void disableCoreDump()
{
bool ok = false;
const int disableCoreDump = qEnvironmentVariableIntValue("QTEST_DISABLE_CORE_DUMP", &ok);
if (ok && disableCoreDump == 1) {
#if defined(Q_OS_UNIX)
struct rlimit limit;
limit.rlim_cur = 0;
limit.rlim_max = 0;
if (setrlimit(RLIMIT_CORE, &limit) != 0)
qWarning("Failed to disable core dumps: %d", errno);
#endif
}
}
Q_CONSTRUCTOR_FUNCTION(disableCoreDump);
static void stackTrace() static void stackTrace()
{ {
bool ok = false; bool ok = false;

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

@ -592,8 +592,10 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QStringList const& logge
QProcess proc; QProcess proc;
QProcessEnvironment environment = processEnvironment(); QProcessEnvironment environment = processEnvironment();
if (crashes) if (crashes) {
environment.insert("QTEST_DISABLE_CORE_DUMP", "1");
environment.insert("QTEST_DISABLE_STACK_DUMP", "1"); environment.insert("QTEST_DISABLE_STACK_DUMP", "1");
}
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);