Disable a test which has no meaning under gdal 3.0

GDAL_FIX_ESRI_WKT is no longer a thing with GDAL 3.0
qgis · Jun 11, 2019 · 7c8d87c · 7c8d87c
1 parent aaea38e
commit 7c8d87c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -354,8 +354,10 @@ QString TestQgsCoordinateReferenceSystem::testESRIWkt( int i, QgsCoordinateRefer
 
   return QString();
 }
+
 void TestQgsCoordinateReferenceSystem::createFromESRIWkt()
 {
+#if PJ_VERSION < 600 // The ESRI fix no longer has any impact on Proj >= 6, GDAL >= 3.0
   QString msg;
   QgsCoordinateReferenceSystem myCrs;
   const char *configOld = CPLGetConfigOption( "GDAL_FIX_ESRI_WKT", "" );
@@ -442,7 +444,10 @@ void TestQgsCoordinateReferenceSystem::createFromESRIWkt()
   }
 
   //  QVERIFY( bOK );
+#endif
 }
+
+
 void TestQgsCoordinateReferenceSystem::createFromSrId()
 {
   QgsCoordinateReferenceSystem myCrs;