From f04b17ab741687c3555139482ab448cf1ee70ee5 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Tue, 29 Jan 2019 10:52:38 +0100
Subject: [PATCH] Revert "BUG: 1818: Commented-out all failing tests due to
bugfix."
This reverts commit 7b89f7ee50b0021476e79d7794911b438cc04259.
---
Examples/Projections/test/CMakeLists.txt | 14 +++---
Examples/Segmentation/test/CMakeLists.txt | 6 +--
.../AppClassification/test/CMakeLists.txt | 36 +++++++--------
.../Applications/AppEdge/test/CMakeLists.txt | 14 +++---
.../AppProjection/test/CMakeLists.txt | 44 +++++++++----------
.../AppSegmentation/test/CMakeLists.txt | 21 ++++-----
.../AppVectorUtils/test/CMakeLists.txt | 13 +++---
.../ObjectDetection/test/CMakeLists.txt | 6 +--
.../Filtering/Projection/test/CMakeLists.txt | 24 +++++-----
Modules/IO/Carto/test/CMakeLists.txt | 13 +++---
Modules/Learning/Sampling/test/CMakeLists.txt | 16 +++----
.../Conversion/test/CMakeLists.txt | 7 +--
12 files changed, 109 insertions(+), 105 deletions(-)
diff --git a/Examples/Projections/test/CMakeLists.txt b/Examples/Projections/test/CMakeLists.txt
index fb1df7dc1d..26098eb64c 100644
--- a/Examples/Projections/test/CMakeLists.txt
+++ b/Examples/Projections/test/CMakeLists.txt
@@ -64,9 +64,9 @@ otb_add_test(NAME prTeMapProjectionExampleTest COMMAND ${OTB_TEST_DRIVER}
)
otb_add_test(NAME prTeVectorDataProjectionExampleTest COMMAND ${OTB_TEST_DRIVER}
- # --compare-ogr ${NOTOL}
- # ${BASELINE}/vectorDataProjectionExample.shp
- # ${TEMP}/vectorDataProjectionExample.shp
+ --compare-ogr ${NOTOL}
+ ${BASELINE}/vectorDataProjectionExample.shp
+ ${TEMP}/vectorDataProjectionExample.shp
Execute $<TARGET_FILE:VectorDataProjectionExample>
${OTB_DATA_ROOT}/Input/Capitole-Shadows.kml
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF}
@@ -74,9 +74,9 @@ otb_add_test(NAME prTeVectorDataProjectionExampleTest COMMAND ${OTB_TEST_DRIVER}
)
otb_add_test(NAME prTeGeometriesProjectionTest COMMAND ${OTB_TEST_DRIVER}
- # --compare-ogr ${NOTOL}
- # ${BASELINE}/geometriesProjectionExample.shp
- # ${TEMP}/geometriesProjectionExample.shp
+ --compare-ogr ${NOTOL}
+ ${BASELINE}/geometriesProjectionExample.shp
+ ${TEMP}/geometriesProjectionExample.shp
Execute $<TARGET_FILE:GeometriesProjectionExample>
${OTB_DATA_ROOT}/Input/Capitole-Shadows.shp
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF}
@@ -119,7 +119,7 @@ otb_add_test(NAME prTePlaceNameToLonLatExampleTest COMMAND ${OTB_TEST_DRIVER}
Toulouse
)
-# The following test is disabled (GitLab #1669 !244)
+# The following test is disabled (GitLab #1669 !244)
# otb_add_test(NAME prTeCoordinateToNameExampleTest COMMAND ${OTB_TEST_DRIVER}
# --compare-ascii ${NOTOL}
# ${BASELINE}/CoordinateToNameExample.txt
diff --git a/Examples/Segmentation/test/CMakeLists.txt b/Examples/Segmentation/test/CMakeLists.txt
index 25673a98db..a21bb2ac53 100644
--- a/Examples/Segmentation/test/CMakeLists.txt
+++ b/Examples/Segmentation/test/CMakeLists.txt
@@ -294,9 +294,9 @@ otb_add_test(NAME seTeLabelizeNeighborhoodConnectedImageFilterTest COMMAND ${OTB
# ------- StreamingMeanShiftSegmentationTest ----------
if(OTBMathParser_LOADED)
otb_add_test(NAME seTeStreamingMeanShiftSegmentationTest COMMAND ${OTB_TEST_DRIVER}
- --compare-ogr ${NOTOL}
- ${BASELINE_FILES}/seTeStreamingMeanShiftSegmentationTest.shp
- ${TEMP}/seTeStreamingMeanShiftSegmentationTest.shp
+ # --compare-ogr ${NOTOL}
+ # ${BASELINE_FILES}/seTeStreamingMeanShiftSegmentationTest.shp
+ # ${TEMP}/seTeStreamingMeanShiftSegmentationTest.shp
Execute $<TARGET_FILE:StreamingMeanShiftSegmentation>
${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
${INPUTDATA}/QB_Toulouse_Ortho_PAN_Mask.tif
diff --git a/Modules/Applications/AppClassification/test/CMakeLists.txt b/Modules/Applications/AppClassification/test/CMakeLists.txt
index d6e2e1af2e..13db483c00 100644
--- a/Modules/Applications/AppClassification/test/CMakeLists.txt
+++ b/Modules/Applications/AppClassification/test/CMakeLists.txt
@@ -939,9 +939,9 @@ otb_test_application(NAME apTvClSampleSelection
-strategy byclass
-strategy.byclass.in ${INPUTDATA}/Classification/sampling_required.csv
-sampler periodic
- # VALID --compare-ogr ${NOTOL}
- # ${OTBAPP_BASELINE_FILES}/apTvClSampleSelectionOut.sqlite
- # ${TEMP}/apTvClSampleSelectionOut.sqlite)
+ VALID --compare-ogr ${NOTOL}
+ ${OTBAPP_BASELINE_FILES}/apTvClSampleSelectionOut.sqlite
+ ${TEMP}/apTvClSampleSelectionOut.sqlite)
#----------- SampleExtraction TESTS -----------------------
otb_test_application(NAME apTvClSampleExtraction
@@ -950,9 +950,9 @@ otb_test_application(NAME apTvClSampleExtraction
-vec ${INPUTDATA}/Classification/apTvClSampleSelectionOut.sqlite
-field class
-out ${TEMP}/apTvClSampleExtractionOut.sqlite
- # VALID --compare-ogr ${NOTOL}
- # ${OTBAPP_BASELINE_FILES}/apTvClSampleExtractionOut.sqlite
- # ${TEMP}/apTvClSampleExtractionOut.sqlite)
+ VALID --compare-ogr ${NOTOL}
+ ${OTBAPP_BASELINE_FILES}/apTvClSampleExtractionOut.sqlite
+ ${TEMP}/apTvClSampleExtractionOut.sqlite)
#----------- TrainVectorClassifier TESTS ----------------
if(OTB_USE_OPENCV)
@@ -1065,17 +1065,17 @@ otb_test_application(NAME apTvClZonalStatisticsImgNoData
${OTBAPP_BASELINE_FILES}/apTvClVectorData_QB1_ter_stats_nodata.xml
${TEMP}/apTvClVectorData_QB1_ter_stats_nodata.xml)
-
+
otb_test_application(NAME apTvClZonalStatisticsInVecOutRaster
APP ZonalStatistics
- OPTIONS
- -in ${INPUTDATA}/Classification/QB_1_ortho.tif
- -inzone vector
- -inzone.vector.in ${INPUTDATA}/Classification/VectorData_QB1_ter.shp
+ OPTIONS
+ -in ${INPUTDATA}/Classification/QB_1_ortho.tif
+ -inzone vector
+ -inzone.vector.in ${INPUTDATA}/Classification/VectorData_QB1_ter.shp
-inzone.vector.reproject 1
- -out raster
+ -out raster
-out.raster.filename ${TEMP}/apTvClZonalStats_QB1_ter_with_stats_invec.tif
- -out.raster.bv -1
+ -out.raster.bv -1
VALID --compare-image 1
${OTBAPP_BASELINE}/apTvClZonalStats_QB1_ter_with_stats_invec.tif
${TEMP}/apTvClZonalStats_QB1_ter_with_stats_invec.tif
@@ -1083,13 +1083,13 @@ otb_test_application(NAME apTvClZonalStatisticsInVecOutRaster
otb_test_application(NAME apTvClZonalStatisticsInRasterOutRaster
APP ZonalStatistics
- OPTIONS
- -in ${INPUTDATA}/Classification/QB_1_ortho.tif
- -inzone labelimage
+ OPTIONS
+ -in ${INPUTDATA}/Classification/QB_1_ortho.tif
+ -inzone labelimage
-inzone.labelimage.in ${INPUTDATA}/Classification/VectorData_QB1_ter.tif
-inzone.labelimage.nodata -1
- -out raster
- -out.raster.filename ${TEMP}/apTvClZonalStats_QB1_ter_with_stats_inraster.tif
+ -out raster
+ -out.raster.filename ${TEMP}/apTvClZonalStats_QB1_ter_with_stats_inraster.tif
VALID --compare-image 1
${OTBAPP_BASELINE}/apTvClZonalStats_QB1_ter_with_stats_inraster.tif
${TEMP}/apTvClZonalStats_QB1_ter_with_stats_inraster.tif
diff --git a/Modules/Applications/AppEdge/test/CMakeLists.txt b/Modules/Applications/AppEdge/test/CMakeLists.txt
index af32a7ce8f..10c0bcad67 100644
--- a/Modules/Applications/AppEdge/test/CMakeLists.txt
+++ b/Modules/Applications/AppEdge/test/CMakeLists.txt
@@ -25,18 +25,17 @@ otb_test_application(NAME apTvFeLineSegmentDetectionNoRescale
OPTIONS -in LARGEINPUT{DEMPSTER-SHAFER/ROI_QB_TOULOUSE.TIF}
-out ${TEMP}/feTvLineSegmentDetection_LI_NoRescale.shp
-norescale true
- # VALID --compare-ogr ${EPSILON_9}
- # ${OTBAPP_BASELINE_FILES}/feTvLineSegmentDetection_LI_NoRescale.shp
- # ${TEMP}/feTvLineSegmentDetection_LI_NoRescale.shp)
+ VALID --compare-ogr ${EPSILON_9}
+ ${OTBAPP_BASELINE_FILES}/feTvLineSegmentDetection_LI_NoRescale.shp
+ ${TEMP}/feTvLineSegmentDetection_LI_NoRescale.shp)
otb_test_application(NAME apTvFeLineSegmentDetection
APP LineSegmentDetection
-# OPTIONS -in ${INPUTDATA}/ctest/ROI_QB_TOULOUSE_ortho_200x200.tif
OPTIONS -in LARGEINPUT{DEMPSTER-SHAFER/ROI_QB_TOULOUSE.TIF}
-out ${TEMP}/feTvLineSegmentDetection_LI.shp
- # VALID --compare-ogr ${EPSILON_9}
- # ${OTBAPP_BASELINE_FILES}/feTvLineSegmentDetection_LI.shp
- # ${TEMP}/feTvLineSegmentDetection_LI.shp)
+ VALID --compare-ogr ${EPSILON_9}
+ ${OTBAPP_BASELINE_FILES}/feTvLineSegmentDetection_LI.shp
+ ${TEMP}/feTvLineSegmentDetection_LI.shp)
#----------- EdgeExtraction TESTS ----------------
@@ -49,3 +48,4 @@ otb_test_application(NAME apTvFEEdgeExtraction
VALID --compare-image ${NOTOL}
${BASELINE}/apTvFEEdgeExtraction.tif
${TEMP}/apTvFEEdgeExtraction.tif)
+
diff --git a/Modules/Applications/AppProjection/test/CMakeLists.txt b/Modules/Applications/AppProjection/test/CMakeLists.txt
index 5b3f322f2d..e9f945591f 100644
--- a/Modules/Applications/AppProjection/test/CMakeLists.txt
+++ b/Modules/Applications/AppProjection/test/CMakeLists.txt
@@ -203,9 +203,9 @@ otb_test_application(NAME apTvPrVectorDataReprojectionFromMapToMap
-out.vd ${TEMP}/apTvPrVectorDataReprojectionFromMapToMap.shp
-out.proj user
-out.proj.user.map lambert93
- # VALID --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToMap.sqlite
- # ${TEMP}/apTvPrVectorDataReprojectionFromMapToMap.shp)
+ VALID --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToMap.sqlite
+ ${TEMP}/apTvPrVectorDataReprojectionFromMapToMap.shp)
otb_test_application(NAME apTvPrVectorDataReprojectionFromMapToImage
APP VectorDataReprojection
@@ -213,9 +213,9 @@ otb_test_application(NAME apTvPrVectorDataReprojectionFromMapToImage
-out.vd ${TEMP}/apTvPrVectorDataReprojectionFromMapToImage.shp
-out.proj image
-out.proj.image.in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
- # VALID --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToImage.shp
- # ${TEMP}/apTvPrVectorDataReprojectionFromMapToImage.shp)
+ VALID --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToImage.shp
+ ${TEMP}/apTvPrVectorDataReprojectionFromMapToImage.shp)
otb_test_application(NAME apTvPrVectorDataReprojectionFromMapToSensor
APP VectorDataReprojection
@@ -223,9 +223,9 @@ otb_test_application(NAME apTvPrVectorDataReprojectionFromMapToSensor
-out.vd ${TEMP}/apTvPrVectorDataReprojectionFromMapToSensor.shp
-out.proj image
-out.proj.image.in LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF}
- # VALID --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToSensor.shp
- # ${TEMP}/apTvPrVectorDataReprojectionFromMapToSensor.shp)
+ VALID --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToSensor.shp
+ ${TEMP}/apTvPrVectorDataReprojectionFromMapToSensor.shp)
otb_test_application(NAME apTvPrVectorDataReprojectionFromMapToMap2
APP VectorDataReprojection
@@ -235,9 +235,9 @@ otb_test_application(NAME apTvPrVectorDataReprojectionFromMapToMap2
-out.proj.user.map utm
-out.proj.user.map.utm.northhem true
-out.proj.user.map.utm.zone 31
- # VALID --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/apTvPrVectorDataReprojectionFromMapToMap2.sqlite
- # ${TEMP}/apTvPrVectorDataReprojectionFromMapToMap2.sqlite)
+ VALID --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/apTvPrVectorDataReprojectionFromMapToMap2.sqlite
+ ${TEMP}/apTvPrVectorDataReprojectionFromMapToMap2.sqlite)
otb_test_application(NAME apTvPrVectorDataReprojectionFromMapToGeo
APP VectorDataReprojection
@@ -245,9 +245,9 @@ otb_test_application(NAME apTvPrVectorDataReprojectionFromMapToGeo
-out.vd ${TEMP}/apTvPrVectorDataReprojectionFromMapToGeo.kml
-out.proj user
-out.proj.user.map wgs
- # VALID --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToGeo.kml
- # ${TEMP}/apTvPrVectorDataReprojectionFromMapToGeo.kml)
+ VALID --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToGeo.kml
+ ${TEMP}/apTvPrVectorDataReprojectionFromMapToGeo.kml)
otb_test_application(NAME apTuPrVectorDataReprojectionFromGeoToMap
APP VectorDataReprojection
@@ -283,16 +283,16 @@ otb_test_application(NAME apTvPrRefineSensorModel
${BASELINE_FILES}/apTvPrRefineSensorModelGeomOutput.geom
${TEMP}/apTvPrRefineSensorModelGeomOutput.geom)
-
+
otb_test_application(NAME apTvPrRefineSensorModel2
APP RefineSensorModel
- OPTIONS -ingeom ${INPUTDATA}/s1a-iw-grd-vh-20150210t060009-20150210t060034-004557-0059a3-002.geom
+ OPTIONS -ingeom ${INPUTDATA}/s1a-iw-grd-vh-20150210t060009-20150210t060034-004557-0059a3-002.geom
-inpoints ${INPUTDATA}/pts_idV5.txt
-outgeom ${TEMP}/apTvPrRefineSensorModelGeomOutput2.geom
VALID --compare-ascii 0.1
${BASELINE_FILES}/apTvPrRefineSensorModelGeomOutput2.geom
${TEMP}/apTvPrRefineSensorModelGeomOutput2.geom)
-
+
#----------- RigidTransformResample TESTS ----------------
@@ -307,7 +307,7 @@ otb_test_application(NAME apTvPrRigidTransformResample
VALID --compare-image ${NOTOL}
${BASELINE}/owTvRigidTransformResampleTest.tif
${TEMP}/apTvPrRigidTransformResampleTest.tif)
-
+
@@ -316,9 +316,9 @@ otb_test_application(NAME apTvPrImageEnvelopeTest
APP ImageEnvelope
OPTIONS -in ${EXAMPLEDATA}/sensor_stereo_left.tif
-out ${TEMP}/apTvPrImageEnvelopeTest.shp
- # VALID --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/apTvPrImageEnvelopeTest.shp
- # ${TEMP}/apTvPrImageEnvelopeTest.shp)
+ VALID --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/apTvPrImageEnvelopeTest.shp
+ ${TEMP}/apTvPrImageEnvelopeTest.shp)
#----------- ConvertSensorToGeoPoint TESTS ----------------
diff --git a/Modules/Applications/AppSegmentation/test/CMakeLists.txt b/Modules/Applications/AppSegmentation/test/CMakeLists.txt
index aa5ec2fac8..d62fd6c7e8 100644
--- a/Modules/Applications/AppSegmentation/test/CMakeLists.txt
+++ b/Modules/Applications/AppSegmentation/test/CMakeLists.txt
@@ -261,7 +261,7 @@ otb_test_application(NAME apTvSmallRegionsMerging
${BASELINE}/apTvSmallMerged.tif
${TEMP}/apTvSmallMerged.tif
)
-
+
set_property(TEST apTvSmallRegionsMerging PROPERTY DEPENDS apTvLSMS2Segmentation)
#----------- LSMSVectorization TESTS ----------------
@@ -272,9 +272,9 @@ otb_test_application(NAME apTvLSMS4Vectorization_SmallMerged
-out ${TEMP}/apTvLSMS4_Segmentation_SmallMerged.shp
-tilesizex 100
-tilesizey 100
- # VALID --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/apTvLSMS4_Segmentation_SmallMerged.shp
- # ${TEMP}/apTvLSMS4_Segmentation_SmallMerged.shp
+ VALID --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/apTvLSMS4_Segmentation_SmallMerged.shp
+ ${TEMP}/apTvLSMS4_Segmentation_SmallMerged.shp
)
set_property(TEST apTvLSMS4Vectorization_SmallMerged PROPERTY DEPENDS apTvLSMS3SmallRegionsMerging)
@@ -286,9 +286,9 @@ otb_test_application(NAME apTvLSMS4Vectorization_NoSmall
-out ${TEMP}/apTvLSMS4_Segmentation_NoSmall.shp
-tilesizex 100
-tilesizey 100
- # VALID --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/apTvLSMS4_Segmentation_NoSmall.shp
- # ${TEMP}/apTvLSMS4_Segmentation_NoSmall.shp
+ VALID --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/apTvLSMS4_Segmentation_NoSmall.shp
+ ${TEMP}/apTvLSMS4_Segmentation_NoSmall.shp
)
set_property(TEST apTvLSMS4Vectorization_NoSmall PROPERTY DEPENDS apTvLSMS2Segmentation_NoSmall)
@@ -318,7 +318,8 @@ otb_test_application(NAME apTvSeLargeScaleMeanShiftTest
-tilesizey 100
-mode vector
-mode.vector.out ${TEMP}/apTvSeLargeScaleMeanShiftTestOut.shp
- # VALID --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/apTvSeLargeScaleMeanShiftTestOut.shp
- # ${TEMP}/apTvSeLargeScaleMeanShiftTestOut.shp
+ VALID --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/apTvSeLargeScaleMeanShiftTestOut.shp
+ ${TEMP}/apTvSeLargeScaleMeanShiftTestOut.shp
)
+
diff --git a/Modules/Applications/AppVectorUtils/test/CMakeLists.txt b/Modules/Applications/AppVectorUtils/test/CMakeLists.txt
index 554c0160e8..eef039f5c4 100644
--- a/Modules/Applications/AppVectorUtils/test/CMakeLists.txt
+++ b/Modules/Applications/AppVectorUtils/test/CMakeLists.txt
@@ -26,9 +26,9 @@ otb_test_application(NAME apTvUtVectorDataTransform_Rotation
-vd ${INPUTDATA}/ToulouseRoad-examples.shp
-out ${TEMP}/apTvUtVectorDataTransform_rotation.shp
-transform.ro 15
- # VALID --compare-ogr ${NOTOL}
- # ${OTBAPP_BASELINE_FILES}/utTvVectorDataTransformFilter_Rotation.shp
- # ${TEMP}/apTvUtVectorDataTransform_rotation.shp)
+ VALID --compare-ogr ${NOTOL}
+ ${OTBAPP_BASELINE_FILES}/utTvVectorDataTransformFilter_Rotation.shp
+ ${TEMP}/apTvUtVectorDataTransform_rotation.shp)
otb_test_application(NAME apTvUtVectorDataTransform_Translation_Rotation
APP VectorDataTransform
@@ -38,9 +38,9 @@ otb_test_application(NAME apTvUtVectorDataTransform_Translation_Rotation
-transform.ro 15
-transform.tx 5
-transform.ty 6
- # VALID --compare-ogr ${NOTOL}
- # ${OTBAPP_BASELINE_FILES}/utTvVectorDataTransformFilter_Translation_rotation.shp
- # ${TEMP}/apTvUtVectorDataTransform_Translation_rotation.shp)
+ VALID --compare-ogr ${NOTOL}
+ ${OTBAPP_BASELINE_FILES}/utTvVectorDataTransformFilter_Translation_rotation.shp
+ ${TEMP}/apTvUtVectorDataTransform_Translation_rotation.shp)
#----------- VectorDataExtractROI TESTS ----------------
@@ -91,3 +91,4 @@ otb_test_application(NAME apTvUtConcatenateVectorData
VALID --compare-ogr ${NOTOL}
${OTBAPP_BASELINE_FILES}/utTvConcatenateVectorData.shp
${TEMP}/apTvUtConcatenateVectorDataOutputTest.shp)
+
diff --git a/Modules/Detection/ObjectDetection/test/CMakeLists.txt b/Modules/Detection/ObjectDetection/test/CMakeLists.txt
index cf1e6b262f..6f22f1276c 100644
--- a/Modules/Detection/ObjectDetection/test/CMakeLists.txt
+++ b/Modules/Detection/ObjectDetection/test/CMakeLists.txt
@@ -36,9 +36,9 @@ otb_module_target_label(otbObjectDetectionTestDriver)
otb_add_test(NAME odTvLabeledSampleLocalizationGenerator COMMAND otbObjectDetectionTestDriver
- # --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/TvLabeledSampleLocalizationGeneratorOutput.shp
- # ${TEMP}/TvLabeledSampleLocalizationGeneratorOutput.shp
+ --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/TvLabeledSampleLocalizationGeneratorOutput.shp
+ ${TEMP}/TvLabeledSampleLocalizationGeneratorOutput.shp
otbLabeledSampleLocalizationGenerator
${INPUTDATA}/ObjectReco/Boats/maur_B010202_01LabeledPoints.shp
${INPUTDATA}/ObjectReco/Boats/maur_B010202_01Polygons.shp
diff --git a/Modules/Filtering/Projection/test/CMakeLists.txt b/Modules/Filtering/Projection/test/CMakeLists.txt
index 3180d45d4f..0df148140b 100644
--- a/Modules/Filtering/Projection/test/CMakeLists.txt
+++ b/Modules/Filtering/Projection/test/CMakeLists.txt
@@ -451,9 +451,9 @@ otb_add_test(NAME prTvGeometriesProjectionFilterFromMapToSensor COMMAND otbProje
)
otb_add_test(NAME prTvImageToEnvelopeVectorDataFilter COMMAND otbProjectionTestDriver
- # --compare-ogr ${EPSILON_6}
- # ${BASELINE_FILES}/prTvImageToEnvelopeVectorDataFilterOutput.kml
- # ${TEMP}/prTvImageToEnvelopeVectorDataFilterOutput.kml
+ --compare-ogr ${EPSILON_6}
+ ${BASELINE_FILES}/prTvImageToEnvelopeVectorDataFilterOutput.kml
+ ${TEMP}/prTvImageToEnvelopeVectorDataFilterOutput.kml
otbImageToEnvelopeVectorDataFilter
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF}
${TEMP}/prTvImageToEnvelopeVectorDataFilterOutput.kml
@@ -479,9 +479,9 @@ otb_add_test(NAME prTvGeometriesProjectionFilterFromMapToGeo COMMAND otbProjecti
--compare-ogr ${NOTOL}
${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToGeo.kml
${TEMP}/prTvGeometriesProjectionFilterFromMapToGeo.shp
- # otbGeometriesProjectionFilterFromMapToGeo
- # ${INPUTDATA}/ToulousePoints-examples.shp
- # ${TEMP}/prTvGeometriesProjectionFilterFromMapToGeo.shp
+ otbGeometriesProjectionFilterFromMapToGeo
+ ${INPUTDATA}/ToulousePoints-examples.shp
+ ${TEMP}/prTvGeometriesProjectionFilterFromMapToGeo.shp
)
otb_add_test(NAME leTvROIdataConversion COMMAND otbProjectionTestDriver
@@ -495,9 +495,9 @@ otb_add_test(NAME leTvROIdataConversion COMMAND otbProjectionTestDriver
)
otb_add_test(NAME prTvVectorDataProjectionFilterFromMapToGeo COMMAND otbProjectionTestDriver
- # --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToGeo.kml
- # ${TEMP}/prTvVectorDataProjectionFilterFromMapToGeo.kml
+ --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToGeo.kml
+ ${TEMP}/prTvVectorDataProjectionFilterFromMapToGeo.kml
otbVectorDataProjectionFilterFromMapToGeo
${INPUTDATA}/ToulousePoints-examples.shp
${TEMP}/prTvVectorDataProjectionFilterFromMapToGeo.kml
@@ -1115,9 +1115,9 @@ otb_add_test(NAME prTvGeometriesProjectionFilterFromMapToEPSG_UTM COMMAND otbPro
32631 )
otb_add_test(NAME prTvGeometriesProjectionFilterFromMapToEPSG_WGS84 COMMAND otbProjectionTestDriver
- # --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToGeo.kml
- # ${TEMP}/prTvGeometriesProjectionFilterFromMapToEPSG_WGS84.shp
+ --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/prTvVectorDataProjectionFilterFromMapToGeo.kml
+ ${TEMP}/prTvGeometriesProjectionFilterFromMapToEPSG_WGS84.shp
otbGeometriesProjectionFilterFromMapToEPSG
${INPUTDATA}/ToulousePoints-examples.shp
${TEMP}/prTvGeometriesProjectionFilterFromMapToEPSG_WGS84.shp
diff --git a/Modules/IO/Carto/test/CMakeLists.txt b/Modules/IO/Carto/test/CMakeLists.txt
index bcbc4bb94d..ea700f6a84 100644
--- a/Modules/IO/Carto/test/CMakeLists.txt
+++ b/Modules/IO/Carto/test/CMakeLists.txt
@@ -59,9 +59,9 @@ otb_add_test(NAME ioTvMapFileProductWriter COMMAND otbCartoTestDriver
set_property(TEST ioTvMapFileProductWriter PROPERTY RESOURCE_LOCK web_access)
otb_add_test(NAME ioTvOSMToVectorDataGeneratorByName COMMAND otbCartoTestDriver
- # --compare-ogr ${EPSILON_9}
- # ${BASELINE_FILES}/ioTvOSMToVectorDataFilterByName_highway.shp
- # ${TEMP}/ioTvOSMToVectorDataFilterByName_highway.shp
+ --compare-ogr ${EPSILON_9}
+ ${BASELINE_FILES}/ioTvOSMToVectorDataFilterByName_highway.shp
+ ${TEMP}/ioTvOSMToVectorDataFilterByName_highway.shp
otbOSMToVectorDataGeneratorByName
-osm ${INPUTDATA}/qb_road.osm
-vd ${TEMP}/ioTvOSMToVectorDataFilterByName_highway.shp
@@ -69,9 +69,9 @@ otb_add_test(NAME ioTvOSMToVectorDataGeneratorByName COMMAND otbCartoTestDriver
set_property(TEST ioTvOSMToVectorDataGeneratorByName PROPERTY RESOURCE_LOCK web_access)
otb_add_test(NAME ioTvOSMToVectorDataGeneratorTest COMMAND otbCartoTestDriver
- # --compare-ogr ${EPSILON_9}
- # ${BASELINE_FILES}/ioTvOSMToVectorDataFilterTest_highway.shp
- # ${TEMP}/ioTvOSMToVectorDataFilterTest_highway.shp
+ --compare-ogr ${EPSILON_9}
+ ${BASELINE_FILES}/ioTvOSMToVectorDataFilterTest_highway.shp
+ ${TEMP}/ioTvOSMToVectorDataFilterTest_highway.shp
otbOSMToVectorDataGeneratorTest
${INPUTDATA}/qb_road.osm
${TEMP}/ioTvOSMToVectorDataFilterTest_highway.shp
@@ -96,3 +96,4 @@ otb_add_test(NAME coTvCoordinateToNameMultithreadTest COMMAND otbCartoTestDriver
${TEMP}/CoordinateToNameMultithreadTest.txt
1
)
+
diff --git a/Modules/Learning/Sampling/test/CMakeLists.txt b/Modules/Learning/Sampling/test/CMakeLists.txt
index 05579d177e..fe8e118954 100644
--- a/Modules/Learning/Sampling/test/CMakeLists.txt
+++ b/Modules/Learning/Sampling/test/CMakeLists.txt
@@ -40,9 +40,9 @@ otb_add_test(NAME leTvSamplingRateCalculator COMMAND otbSamplingTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/leTvSamplingRateCalculator.txt
${TEMP}/leTvSamplingRateCalculator.txt
- otbSamplingRateCalculator
+ otbSamplingRateCalculator
${TEMP}/leTvSamplingRateCalculator.txt)
-
+
# ----------------- OGRDataToSamplePositionFilter ----------------------------
otb_add_test(NAME leTvOGRDataToSamplePositionFilterPoly COMMAND otbSamplingTestDriver
otbOGRDataToSamplePositionFilter
@@ -51,14 +51,14 @@ otb_add_test(NAME leTvOGRDataToSamplePositionFilterPoly COMMAND otbSamplingTestD
${TEMP}/leTvOGRDataToSamplePositionFilterOutput_Poly.sqlite
${BASELINE_FILES}/leTvOGRDataToSamplePositionFilterOutput_Poly.sqlite
)
-
+
otb_add_test(NAME leTvOGRDataToSamplePositionFilterPolyPattern COMMAND otbSamplingTestDriver
otbOGRDataToSamplePositionFilterPattern
${INPUTDATA}/variousVectors.sqlite
${TEMP}/leTvOGRDataToSamplePositionFilterOutput_PolyPattern.sqlite
${BASELINE_FILES}/leTvOGRDataToSamplePositionFilterOutput_PolyPattern.sqlite
)
-
+
otb_add_test(NAME leTvOGRDataToSamplePositionFilterLines COMMAND otbSamplingTestDriver
otbOGRDataToSamplePositionFilter
${INPUTDATA}/variousVectors.sqlite
@@ -66,7 +66,7 @@ otb_add_test(NAME leTvOGRDataToSamplePositionFilterLines COMMAND otbSamplingTest
${TEMP}/leTvOGRDataToSamplePositionFilterOutput_Lines.sqlite
${BASELINE_FILES}/leTvOGRDataToSamplePositionFilterOutput_Lines.sqlite
)
-
+
otb_add_test(NAME leTvOGRDataToSamplePositionFilterPoints COMMAND otbSamplingTestDriver
otbOGRDataToSamplePositionFilter
${INPUTDATA}/variousVectors.sqlite
@@ -86,9 +86,9 @@ otb_add_test(NAME leTvOGRDataToClassStatisticsFilter COMMAND otbSamplingTestDriv
# --------------- ImageSampleExtractorFilter -----------------------------
otb_add_test(NAME leTvImageSampleExtractorFilter COMMAND otbSamplingTestDriver
- # --compare-ogr ${EPSILON_6}
- # ${BASELINE_FILES}/leTvImageSampleExtractorFilterTest.sqlite
- # ${TEMP}/leTvImageSampleExtractorFilterTest.sqlite
+ --compare-ogr ${EPSILON_6}
+ ${BASELINE_FILES}/leTvImageSampleExtractorFilterTest.sqlite
+ ${TEMP}/leTvImageSampleExtractorFilterTest.sqlite
otbImageSampleExtractorFilter
${INPUTDATA}/variousVectors.sqlite
${TEMP}/leTvImageSampleExtractorFilterTest.sqlite)
diff --git a/Modules/Segmentation/Conversion/test/CMakeLists.txt b/Modules/Segmentation/Conversion/test/CMakeLists.txt
index c3de2a52d5..0c4244e578 100644
--- a/Modules/Segmentation/Conversion/test/CMakeLists.txt
+++ b/Modules/Segmentation/Conversion/test/CMakeLists.txt
@@ -69,9 +69,9 @@ otb_add_test(NAME bfTvOGRDataSourceToLabelImageFilterSHPForegroundMode COMMAND o
)
otb_add_test(NAME obTvLabelImageToVectorDataFilter COMMAND otbConversionTestDriver
- # --compare-ogr ${NOTOL}
- # ${BASELINE_FILES}/obTuLabelImageToVectorDataFilter.shp
- # ${TEMP}/obTuLabelImageToVectorDataFilter.shp
+ --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/obTuLabelImageToVectorDataFilter.shp
+ ${TEMP}/obTuLabelImageToVectorDataFilter.shp
otbLabelImageToVectorDataFilter
${INPUTDATA}/labelImage_UnsignedChar.tif
${TEMP}/obTuLabelImageToVectorDataFilter.shp
@@ -209,3 +209,4 @@ otb_add_test(NAME obTvLabelMapToVectorDataFilter COMMAND otbConversionTestDriver
otbLabelMapToVectorDataFilter
${INPUTDATA}/rcc8_mire1.png
${TEMP}/obTvLabelMapToVectorDataFilter.shp)
+
--
GitLab