do not completely disable a test for !OpenGL if OpenGL may be broken

The code comes from f062b89b27 and is
more like patching things up. A proper fix should be elsewhere, but
at least patch this up more to be less wrong.

Change-Id: Ic9b24680688d104028b1e1bf6fccc16e6f786aa8
Reviewed-on: https://gerrit.libreoffice.org/83880
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
This commit is contained in:
Luboš Luňák 2019-11-27 11:10:35 +01:00
parent a17f700044
commit 1c19af307c

View file

@ -21,6 +21,7 @@
#include <rtl/ustring.hxx>
#include <vcl/opengl/OpenGLWrapper.hxx>
#include <vcl/skia/SkiaHelper.hxx>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
@ -280,8 +281,12 @@ void SdExportTest::testTransparentBackground()
void SdExportTest::testMediaEmbedding()
{
if (!OpenGLWrapper::isVCLOpenGLEnabled())
#ifdef _WIN32
// This seems broken. This test should not be disabled for all cases except when OpenGL
// is found to be working, just because in some OpenGL setups this breaks (per the commit log message).
if (!OpenGLWrapper::isVCLOpenGLEnabled() && !SkiaHelper::isVCLSkiaEnabled())
return;
#endif
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/media_embedding.odp"), ODP);