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

QtTest: block almost all Unix signals in the WatchDog thread

Browse Source 
Signals delivered via kill(2) are delivered to any thread that is
running, so let's make sure the WatchDog thread doesn't get them.

This may be hiding bugs in the user's handler code, but in simple unit
tests the user may not be expecting there to be multiple threads in the
first place.

Change-Id: I512648fd617741199e67fffd17822cdcdf30926c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit da0571d87890b587154a6d9124ac29dc30b151dd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2023-09-05 19:02:16 -07:00 committed by Qt Cherry-pick Bot
parent aa606f9760
commit 922f60c140
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/testlib/qtestcase.cpp
View File

@ -217,6 +217,8 @@ static std::string asyncSafeToString(int n)
#endif // defined(Q_OS_UNIX) #endif // defined(Q_OS_UNIX)
} // unnamed namespace } // unnamed namespace
[[maybe_unused]] static void blockUnixSignals();
static bool alreadyDebugging() static bool alreadyDebugging()
{ {
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
@ -1287,6 +1289,7 @@ public:
void run() override void run() override
{ {
blockUnixSignals();
auto locker = qt_unique_lock(mutex); auto locker = qt_unique_lock(mutex);
expecting.store(TestFunctionStart, std::memory_order_release); expecting.store(TestFunctionStart, std::memory_order_release);
waitCondition.notify_all(); waitCondition.notify_all();
@ -1783,9 +1786,8 @@ bool reportResult(bool success, qxp::function_ref<const char *()> lhs,
} // namespace QTest } // namespace QTest
namespace {
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
namespace {
// Helper class for resolving symbol names by dynamically loading "dbghelp.dll". // Helper class for resolving symbol names by dynamically loading "dbghelp.dll".
class DebugSymbolResolver class DebugSymbolResolver
{ {
@ -1939,9 +1941,17 @@ private:
return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_EXECUTE_HANDLER;
} }
}; };
} // unnamed namespace
using FatalSignalHandler = WindowsFaultHandler; using FatalSignalHandler = WindowsFaultHandler;
inline void blockUnixSignals()
{
// Windows does have C signals, but doesn't use them for the purposes we're
// talking about here
}
#elif defined(Q_OS_UNIX) && !defined(Q_OS_WASM) #elif defined(Q_OS_UNIX) && !defined(Q_OS_WASM)
namespace {
class FatalSignalHandler class FatalSignalHandler
{ {
public: public:
@ -2192,12 +2202,26 @@ private:
static bool pauseOnCrash; static bool pauseOnCrash;
}; };
bool FatalSignalHandler::pauseOnCrash = false; bool FatalSignalHandler::pauseOnCrash = false;
} // unnamed namespace
inline void blockUnixSignals()
{
// Block most Unix signals so the WatchDog thread won't be called when
// external signals are delivered, thus avoiding interfering with the test
sigset_t set;
sigfillset(&set);
// we allow the crashing signals, in case we have bugs
for (int signo : FatalSignalHandler::fatalSignals)
sigdelset(&set, signo);
pthread_sigmask(SIG_BLOCK, &set, nullptr);
}
#else // Q_OS_WASM or weird systems #else // Q_OS_WASM or weird systems
class FatalSignalHandler {}; class FatalSignalHandler {};
inline void blockUnixSignals() {}
#endif // Q_OS_* choice #endif // Q_OS_* choice
} // unnamed namespace
static void initEnvironment() static void initEnvironment()
{ {
qputenv("QT_QTESTLIB_RUNNING", "1"); qputenv("QT_QTESTLIB_RUNNING", "1");