Kaydet (Commit) e6958373 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 038d13ef
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
#include <svx/svdpage.hxx> #include <svx/svdpage.hxx>
#include <svx/svdview.hxx> #include <svx/svdview.hxx>
#include <vcl/svapp.hxx>
#include <crsskip.hxx> #include <crsskip.hxx>
#include <drawdoc.hxx> #include <drawdoc.hxx>
#include <wrtsh.hxx> #include <wrtsh.hxx>
...@@ -80,6 +81,18 @@ void SwTiledRenderingTest::callbackImpl(int nType, const char* pPayload) ...@@ -80,6 +81,18 @@ void SwTiledRenderingTest::callbackImpl(int nType, const char* pPayload)
void SwTiledRenderingTest::testRegisterCallback() 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"); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
pXTextDocument->registerCallback(&SwTiledRenderingTest::callback, this); pXTextDocument->registerCallback(&SwTiledRenderingTest::callback, this);
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment