Skip to content

Commit

Permalink
Revert "remove GDAL_VERSION_MAJOR >= 2 test"
Browse files Browse the repository at this point in the history 
This reverts commit cb2e81e.
  • Loading branch information
@3nids
3nids committed Jan 30, 2017
1 parent cb2e81e commit a79bf97
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion tests/src/core/testqgsinvertedpolygonrenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ class TestQgsInvertedPolygon : public QObject
void graduatedSubRenderer();
void preprocess();
void projectionTest();
#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_MAJOR >= 2
void curvedPolygons();
#endif

private:
bool mTestHasError;
Expand Down Expand Up @@ -147,7 +149,8 @@ void TestQgsInvertedPolygon::projectionTest()
mMapSettings.setCrsTransformEnabled( false );
}

// This test relies on GDAL support of curved polygons i.e. GDAL >= 2
#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_MAJOR >= 2
// This test relies on GDAL support of curved polygons
void TestQgsInvertedPolygon::curvedPolygons()
{
QString myCurvedPolysFileName = mTestDataDir + "curved_polys.gpkg";
Expand All @@ -163,6 +166,7 @@ void TestQgsInvertedPolygon::curvedPolygons()
QVERIFY( imageCheck( "inverted_polys_curved" ) );
mMapSettings.setLayers( QStringList() << curvedLayer->id() );
}
#endif

//
// Private helper functions not called directly by CTest
Expand Down

1 comment on commit a79bf97

@nyalldawson
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@3nids - heh - i'd tried that too, and quickly backed it out as well. Looks like that test was never running due to the invalid #if and has been broken for some time.

@mhugo can you take a look at this?

Please sign in to comment.