diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2017-08-14 21:28:57 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-22 05:10:43 +0000 |
commit | 1497e5853beac21c1d40ea377f6d6f41b5a30082 (patch) | |
tree | d4a53ae19570a7f3eec9907d73b8dad8c68ad99b /src | |
parent | 8b8578a155b7932a79049174f913eea3379c0f28 (diff) |
QTestLib: Disable App Nap on macOS
App Nap may cause stalls or timer delays during test runs.
Change-Id: I828282d12127918439a9a2a4f7d7be6cac457b42
Task-number: QTBUG-61499
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/testlib/qtestcase.cpp | 3 | ||||
-rw-r--r-- | src/testlib/qtestutil_macos.mm | 27 | ||||
-rw-r--r-- | src/testlib/qtestutil_macos_p.h | 11 |
3 files changed, 41 insertions, 0 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index a4099c3cd8..cbd38d0788 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1728,6 +1728,9 @@ void QTest::qInit(QObject *testObject, int argc, char **argv) // Don't restore saved window state for auto tests. QTestPrivate::disableWindowRestore(); + + // Disable App Nap which may cause tests to stall. + QTestPrivate::AppNapDisabler appNapDisabler; #endif #if defined(Q_OS_MACX) diff --git a/src/testlib/qtestutil_macos.mm b/src/testlib/qtestutil_macos.mm index 70a7fb9f85..7579c3b164 100644 --- a/src/testlib/qtestutil_macos.mm +++ b/src/testlib/qtestutil_macos.mm @@ -54,6 +54,33 @@ namespace QTestPrivate { void disableWindowRestore() { [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"ApplePersistenceIgnoreState"]; } + + /*! \internal + \class AppNapDisabler + \brief Disables App Nap by registereing a bacground activity. + + App Nap remains disabled as long as the AppNapDisabler instance + exists. + */ + + /*! \internal + Creates an AppNapDisabler instance and starts a NSActivityBackground activity. + */ + AppNapDisabler::AppNapDisabler() + { + m_activity = [[NSProcessInfo processInfo] beginActivityWithOptions:NSActivityBackground + reason:@"Qt Auto Test"]; + [m_activity retain]; + } + + /*! \internal + Destroys the AppNapDisabler instance and ends the NSActivityBackground activity. + */ + AppNapDisabler::~AppNapDisabler() + { + [[NSProcessInfo processInfo] endActivity:m_activity]; + [m_activity release]; + } } QT_END_NAMESPACE diff --git a/src/testlib/qtestutil_macos_p.h b/src/testlib/qtestutil_macos_p.h index d7cc5bc251..36f27167c0 100644 --- a/src/testlib/qtestutil_macos_p.h +++ b/src/testlib/qtestutil_macos_p.h @@ -58,6 +58,17 @@ QT_BEGIN_NAMESPACE namespace QTestPrivate { void disableWindowRestore(); + + class AppNapDisabler + { + public: + AppNapDisabler(); + ~AppNapDisabler(); + AppNapDisabler(const AppNapDisabler&) = delete; + AppNapDisabler& operator=(const AppNapDisabler&) = delete; + private: + id m_activity; + }; } QT_END_NAMESPACE |