Disable Direct2D checks failing under Wine

Now that these Direct2D tests are compiled, disable those of them that
fail under Wine due to missing support for Direct2D functionality we use
in Wine implementation.

Don't even give a warning message because there would be too many of
them in these tests, just skip them silently.
This commit is contained in:
Vadim Zeitlin
2021-08-24 00:44:49 +02:00
parent b6e29ea4d1
commit 37c5f079f1
2 changed files with 21 additions and 0 deletions

View File

@@ -338,6 +338,9 @@ TEST_CASE("GraphicsBitmapTestCase::Create", "[graphbitmap][create]")
#if wxUSE_GRAPHICS_DIRECT2D #if wxUSE_GRAPHICS_DIRECT2D
SECTION("Direct2D GC") SECTION("Direct2D GC")
{ {
if ( wxIsRunningUnderWine() )
return;
wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer(); wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer();
REQUIRE(gr != NULL); REQUIRE(gr != NULL);
CheckCreateGraphBitmap(gr, bmp, image); CheckCreateGraphBitmap(gr, bmp, image);
@@ -445,6 +448,9 @@ TEST_CASE("GraphicsBitmapTestCase::Create", "[graphbitmap][create]")
#if wxUSE_GRAPHICS_DIRECT2D #if wxUSE_GRAPHICS_DIRECT2D
SECTION("Direct2D GC") SECTION("Direct2D GC")
{ {
if ( wxIsRunningUnderWine() )
return;
wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer(); wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer();
REQUIRE(gr != NULL); REQUIRE(gr != NULL);
CheckCreateGraphBitmap(gr, bmp, image); CheckCreateGraphBitmap(gr, bmp, image);
@@ -550,6 +556,9 @@ TEST_CASE("GraphicsBitmapTestCase::Create", "[graphbitmap][create]")
#if wxUSE_GRAPHICS_DIRECT2D #if wxUSE_GRAPHICS_DIRECT2D
SECTION("Direct2D GC") SECTION("Direct2D GC")
{ {
if ( wxIsRunningUnderWine() )
return;
wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer(); wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer();
REQUIRE(gr != NULL); REQUIRE(gr != NULL);
CheckCreateGraphBitmap(gr, bmp, image); CheckCreateGraphBitmap(gr, bmp, image);
@@ -665,6 +674,9 @@ TEST_CASE("GraphicsBitmapTestCase::SubBitmap", "[graphbitmap][subbitmap][create]
#if wxUSE_GRAPHICS_DIRECT2D #if wxUSE_GRAPHICS_DIRECT2D
SECTION("Direct2D GC") SECTION("Direct2D GC")
{ {
if ( wxIsRunningUnderWine() )
return;
wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer(); wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer();
REQUIRE(gr != NULL); REQUIRE(gr != NULL);
CheckCreateGraphSubBitmap(gr, bmp, subX, subY, subW, subH, image); CheckCreateGraphSubBitmap(gr, bmp, subX, subY, subW, subH, image);
@@ -796,6 +808,9 @@ TEST_CASE("GraphicsBitmapTestCase::SubBitmap", "[graphbitmap][subbitmap][create]
#if wxUSE_GRAPHICS_DIRECT2D #if wxUSE_GRAPHICS_DIRECT2D
SECTION("Direct2D GC") SECTION("Direct2D GC")
{ {
if ( wxIsRunningUnderWine() )
return;
wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer(); wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer();
REQUIRE(gr != NULL); REQUIRE(gr != NULL);
CheckCreateGraphSubBitmap(gr, bmp, subX, subY, subW, subH, image); CheckCreateGraphSubBitmap(gr, bmp, subX, subY, subW, subH, image);
@@ -909,6 +924,9 @@ TEST_CASE("GraphicsBitmapTestCase::SubBitmap", "[graphbitmap][subbitmap][create]
#if wxUSE_GRAPHICS_DIRECT2D #if wxUSE_GRAPHICS_DIRECT2D
SECTION("Direct2D GC") SECTION("Direct2D GC")
{ {
if ( wxIsRunningUnderWine() )
return;
wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer(); wxGraphicsRenderer* gr = wxGraphicsRenderer::GetDirect2DRenderer();
REQUIRE(gr != NULL); REQUIRE(gr != NULL);
CheckCreateGraphSubBitmap(gr, bmp, subX, subY, subW, subH, image); CheckCreateGraphSubBitmap(gr, bmp, subX, subY, subW, subH, image);

View File

@@ -51,6 +51,9 @@ TEST_CASE("GraphicsPathTestCaseGDIPlus", "[path][gdi+]")
#if wxUSE_GRAPHICS_DIRECT2D #if wxUSE_GRAPHICS_DIRECT2D
TEST_CASE("GraphicsPathTestCaseDirect2D", "[path][d2d]") TEST_CASE("GraphicsPathTestCaseDirect2D", "[path][d2d]")
{ {
if ( wxIsRunningUnderWine() )
return;
wxBitmap bmp(500, 500); wxBitmap bmp(500, 500);
wxMemoryDC mdc(bmp); wxMemoryDC mdc(bmp);
wxScopedPtr<wxGraphicsContext> gc(wxGraphicsRenderer::GetDirect2DRenderer()->CreateContext(mdc)); wxScopedPtr<wxGraphicsContext> gc(wxGraphicsRenderer::GetDirect2DRenderer()->CreateContext(mdc));