diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-06-03 16:49:30 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-06-03 17:00:48 +0300 |
| commit | f062b89b277a0830f038cafdd13bd074b5188455 (patch) | |
| tree | 4195f8d9f3d4e1252821a2da79ec272a14e953e8 /sd | |
| parent | fce299fc64fcfe5280966631613edda7e6031c16 (diff) | |
Try to fix tinderbox build running in RDP session from Linux on Windows pre-10
It is a complicated scenario, but I think something like this is going
on:
Before Windows 10, only OpenGL 1.1 was supported in RDP sessions. Our
code detects RDP and tries to disable the use of OpenGL in that
case. This code for this is in the neighbourhood of the blacklisting
of OpenGL implementations. But the use of OpenGL in GLTF and chart2
does not go through code paths that would take that into
consideration, so it tries to use OpenGL anyway, and eventually we end
up in InitGLEW(), where the recently added check for OpenGL 3.0 or
newer causes an (intentional) abrupt termination of the process.
Change-Id: Ia57bfc8d2cefe4e6d7a00282973608d17967d3fd
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index a80617c8f876..150e0b524fc0 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -30,7 +30,6 @@ #include <rsc/rscsfx.hxx> - #include <svx/svdoutl.hxx> #include <svx/svdotext.hxx> #include <svx/svdoashp.hxx> @@ -44,6 +43,8 @@ #include <unotools/ucbstreamhelper.hxx> #include <rtl/ustring.hxx> +#include <vcl/opengl/OpenGLWrapper.hxx> + #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/animations/XAnimationNodeSupplier.hpp> @@ -445,6 +446,9 @@ void SdExportTest::testTransparentBackground() void SdExportTest::testMediaEmbedding() { + if (!OpenGLWrapper::isVCLOpenGLEnabled()) + return; + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/media_embedding.odp"), ODP); #if HAVE_FEATURE_GLTF |