Permalink
Browse files

run TestZipLayer::testTarItemSubfolder() only on GDAL>=1.8

  • Loading branch information...
1 parent 1d8ed46 commit 0d4d1fc206aa3f54350ee5aa370532709ee90f2b @jef-n jef-n committed Jun 21, 2012
Showing with 6 additions and 3 deletions.
  1. +6 −3 tests/src/core/testziplayer.cpp
View
9 tests/src/core/testziplayer.cpp
@@ -300,11 +300,11 @@ void TestZipLayer::testPassthruVectorZip()
void TestZipLayer::testPassthruVectorTar()
{
- QSettings settings;
- QString myFileName = mDataDir + "points2.tar";
#if GDAL_VERSION_NUM < 1800
QSKIP( "This test requires GDAL >= 1.8", SkipSingle );
#endif
+ QSettings settings;
+ QString myFileName = mDataDir + "points2.tar";
foreach( QString s, mScanZipSettings )
{
settings.setValue( "/qgis/scanZipInBrowser", s );
@@ -315,10 +315,10 @@ void TestZipLayer::testPassthruVectorTar()
void TestZipLayer::testPassthruVectorGzip()
{
- QSettings settings;
#if GDAL_VERSION_NUM < 1700
QSKIP( "This test requires GDAL >= 1.7", SkipSingle );
#endif
+ QSettings settings;
foreach( QString s, mScanZipSettings )
{
settings.setValue( "/qgis/scanZipInBrowser", s );
@@ -491,6 +491,9 @@ void TestZipLayer::testZipItemSubfolder()
void TestZipLayer::testTarItemSubfolder()
{
+#if GDAL_VERSION_NUM < 1800
+ QSKIP( "This test requires GDAL >= 1.8", SkipSingle );
+#endif
QSettings settings;
foreach( QString s, mScanZipSettings )
{

0 comments on commit 0d4d1fc

Please sign in to comment.