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

jef-n · jef-n · commit 0d4d1fc206aa · 2012-06-21T10:02:45.000+02:00
diff --git a/tests/src/core/testziplayer.cpp b/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 )
   {

Original file line number	Diff line number	Diff line change
`@@ -300,11 +300,11 @@ void TestZipLayer::testPassthruVectorZip()`
`300`	`300`
`301`	`301`	`void TestZipLayer::testPassthruVectorTar()`
`302`	`302`	`{`
`303`		`- QSettings settings;`
`304`		`- QString myFileName = mDataDir + "points2.tar";`
`305`	`303`	`#if GDAL_VERSION_NUM < 1800`
`306`	`304`	`QSKIP( "This test requires GDAL >= 1.8", SkipSingle );`
`307`	`305`	`#endif`
	`306`	`+ QSettings settings;`
	`307`	`+ QString myFileName = mDataDir + "points2.tar";`
`308`	`308`	`foreach( QString s, mScanZipSettings )`
`309`	`309`	`{`
`310`	`310`	`settings.setValue( "/qgis/scanZipInBrowser", s );`
`@@ -315,10 +315,10 @@ void TestZipLayer::testPassthruVectorTar()`
`315`	`315`
`316`	`316`	`void TestZipLayer::testPassthruVectorGzip()`
`317`	`317`	`{`
`318`		`- QSettings settings;`
`319`	`318`	`#if GDAL_VERSION_NUM < 1700`
`320`	`319`	`QSKIP( "This test requires GDAL >= 1.7", SkipSingle );`
`321`	`320`	`#endif`
	`321`	`+ QSettings settings;`
`322`	`322`	`foreach( QString s, mScanZipSettings )`
`323`	`323`	`{`
`324`	`324`	`settings.setValue( "/qgis/scanZipInBrowser", s );`
`@@ -491,6 +491,9 @@ void TestZipLayer::testZipItemSubfolder()`
`491`	`491`
`492`	`492`	`void TestZipLayer::testTarItemSubfolder()`
`493`	`493`	`{`
	`494`	`+#if GDAL_VERSION_NUM < 1800`
	`495`	`+ QSKIP( "This test requires GDAL >= 1.8", SkipSingle );`
	`496`	`+#endif`
`494`	`497`	`QSettings settings;`
`495`	`498`	`foreach( QString s, mScanZipSettings )`
`496`	`499`	`{`