[opencl] Rename test function for consistency

qgis · Aug 8, 2018 · 84dd14a · 84dd14a
1 parent 07db3f8
commit 84dd14a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/tests/src/analysis/testqgsninecellfilters.cpp b/tests/src/analysis/testqgsninecellfilters.cpp
@@ -98,13 +98,18 @@ void TestNineCellFilters::_testAlg( const QString &name, bool useOpenCl )
   QString tmpFile( tempFile( name ) );
 #endif
   QString refFile( referenceFile( name ) );
+<<<<<<< 07db3f84c4506833beea9c3e79858bf932ea028a
 <<<<<<< 8689c401a2a66b4b159a54d0c37e26a33aa183c3
   T ninecellFilter( SRC_FILE, tmpFile, "GTiff" );
   int res = ninecellFilter.processRaster();
 =======
   T ninecellsfilter( SRC_FILE, tmpFile, "GTiff" );
   int res = ninecellsfilter.processRaster();
 >>>>>>> [opencl] Increase test coverage with no-opencl image comparison
+=======
+  T ninecellFilter( SRC_FILE, tmpFile, "GTiff" );
+  int res = ninecellFilter.processRaster();
+>>>>>>> [opencl] Rename test function for consistency
   QVERIFY( res == 0 );
 
   // Produced file