diff options
| author | Patrick Luby <plubius@neooffice.org> | 2023-09-11 10:37:07 -0400 |
|---|---|---|
| committer | Patrick Luby <plubius@neooffice.org> | 2023-09-12 14:09:40 +0200 |
| commit | 26313599b0eae3b397bb341c63d185f8771af82d (patch) | |
| tree | 368e1958ef39da31dabdefac1d3f29511fe9ba25 /vcl/osx/salinst.cxx | |
| parent | 765ad727ebf11e645b4237179d75491a65e04da6 (diff) | |
attempt to fix macos jenkins hangs - part 3
oox::xls::WorkbookFragment::finalizeImport() calls
AquaSalInstance::DoYield() with bWait set to true. But
since unit tests generally have no expected user generated
events, we can end up blocking and waiting forever so
don't block and wait when running unit tests.
Change-Id: I14cfdb88f04b82f49e8c15e554e5c4b4053e77b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156826
Tested-by: Jenkins
Reviewed-by: Patrick Luby <plubius@neooffice.org>
Diffstat (limited to 'vcl/osx/salinst.cxx')
| -rw-r--r-- | vcl/osx/salinst.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 412aacd3d27b..8177c2c8309f 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -630,8 +630,14 @@ bool AquaSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents) { SolarMutexReleaser aReleaser; + // attempt to fix macos jenkins hangs - part 3 + // oox::xls::WorkbookFragment::finalizeImport() calls + // AquaSalInstance::DoYield() with bWait set to true. But + // since unit tests generally have no expected user generated + // events, we can end up blocking and waiting forever so + // don't block and wait when running unit tests. pEvent = [NSApp nextEventMatchingMask: NSEventMaskAny - untilDate: [NSDate distantFuture] + untilDate: SalInstance::IsRunningUnitTest() ? [NSDate distantPast] : [NSDate distantFuture] inMode: NSDefaultRunLoopMode dequeue: YES]; if( pEvent ) |