diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-03-30 14:47:43 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-03-30 16:01:39 +0300 |
| commit | e69583737701a2d56a8ed5fe17e0f68bff404ec4 (patch) | |
| tree | a2447cf71c4b1f27ef5329efa7dbc1bff04bbdad /sw/qa/extras | |
| parent | 038d13ef848e0c773d531048637d760395a56d9f (diff) | |
Bypass test that fails on OS X without window system access
With this change, 'make' now succeeds for me when logged in through
ssh to a Mac where I am not logged in on the console or through Screen
Sharing.
Change-Id: I8aa7f3174b00544fa8e399c8d4dcd9cc801e0dc0
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/tiledrendering/tiledrendering.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 3aa33b27dc91..23d3fe281440 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -12,6 +12,7 @@ #include <comphelper/string.hxx> #include <svx/svdpage.hxx> #include <svx/svdview.hxx> +#include <vcl/svapp.hxx> #include <crsskip.hxx> #include <drawdoc.hxx> #include <wrtsh.hxx> @@ -80,6 +81,18 @@ void SwTiledRenderingTest::callbackImpl(int nType, const char* pPayload) void SwTiledRenderingTest::testRegisterCallback() { +#ifdef MACOSX + // For some reason this particular test requires window system access on OS X. + + // Without window system access, we do get a number of "<<<WARNING>>> + // AquaSalGraphics::CheckContext() FAILED!!!!" [sic] and " <Warning>: CGSConnectionByID: 0 is + // not a valid connection ID" warnings while running the other tests, too, but they still + // succeed. + + if (!vcl::IsWindowSystemAvailable()) + return; +#endif + SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); pXTextDocument->registerCallback(&SwTiledRenderingTest::callback, this); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); |