From 0aa28612ac32a68e0170c7b0290a1db3e348fbf0 Mon Sep 17 00:00:00 2001
From: Cyrille Valladeau <cyrille.valladeau@c-s.fr>
Date: Thu, 1 Dec 2011 19:33:46 +0100
Subject: [PATCH] ENH: update test after -- suppression

---
 .../CartographicDBValidation/CMakeLists.txt   | 152 ++++++-------
 .../ChangeDetection/CMakeLists.txt            |   6 +-
 .../Classification/CMakeLists.txt             | 210 +++++++++---------
 .../DimensionnalityReduction/CMakeLists.txt   |   4 +-
 .../Applications/DisparityMap/CMakeLists.txt  |  72 +++---
 .../FeatureExtraction/CMakeLists.txt          |   8 +-
 .../Applications/Hyperspectral/CMakeLists.txt |  38 ++--
 .../Applications/Projections/CMakeLists.txt   |  48 ++--
 .../RadiometricIndices/CMakeLists.txt         |  10 +-
 .../Applications/Radiometry/CMakeLists.txt    |  42 ++--
 .../Applications/Rasterization/CMakeLists.txt |  28 +--
 .../Applications/Segmentation/CMakeLists.txt  |  40 ++--
 Testing/Applications/Utils/CMakeLists.txt     | 158 ++++++-------
 13 files changed, 408 insertions(+), 408 deletions(-)

diff --git a/Testing/Applications/CartographicDBValidation/CMakeLists.txt b/Testing/Applications/CartographicDBValidation/CMakeLists.txt
index af93d8c0e5..7e5e607c72 100644
--- a/Testing/Applications/CartographicDBValidation/CMakeLists.txt
+++ b/Testing/Applications/CartographicDBValidation/CMakeLists.txt
@@ -2,27 +2,27 @@ IF(OTB_DATA_USE_LARGEINPUT)
 
 OTB_TEST_APPLICATION(NAME apTuCdComputePolylineFeatureFromImage_LI_NONDVI_gt
                      APP  ComputePolylineFeatureFromImage
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/NDVI.TIF
-                			 --vd ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/roads_ground_truth.shp
-                			 --expr  "(b1 > 0.4)"
-  						     --field NONDVI
-                			 --out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_gt.shp)
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/NDVI.TIF
+                			 -vd ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/roads_ground_truth.shp
+                			 -expr  "(b1 > 0.4)"
+  						     -field NONDVI
+                			 -out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_gt.shp)
                    
 OTB_TEST_APPLICATION(NAME apTuCdComputePolylineFeatureFromImage_LI_ROADSA_gt
                      APP  ComputePolylineFeatureFromImage
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/SpectralAngleRoad.TIF
-                			 --vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_gt.shp
-                			 --expr  "(b1 > 0.25)"
-  						     --field "ROADSA"
-                			 --out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_gt.shp)
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/SpectralAngleRoad.TIF
+                			 -vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_gt.shp
+                			 -expr  "(b1 > 0.25)"
+  						     -field "ROADSA"
+                			 -out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_gt.shp)
                                    
 OTB_TEST_APPLICATION(NAME apTvCdComputePolylineFeatureFromImage_LI_NOBUIL_gt
                      APP  ComputePolylineFeatureFromImage
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/BUILDINGS.TIF
-                			 --vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_gt.shp
-                			 --expr  "(b1 == 0)"
-  						     --field "NOBUIL"
-                			 --out ${TEMP}/cdTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/BUILDINGS.TIF
+                			 -vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_gt.shp
+                			 -expr  "(b1 == 0)"
+  						     -field "NOBUIL"
+                			 -out ${TEMP}/cdTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp
                      VALID	 --compare-ogr 0.0
                      		 ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp
                    			 ${TEMP}/cdTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp)
@@ -32,27 +32,27 @@ SET_TESTS_PROPERTIES(apTvCdComputePolylineFeatureFromImage_LI_NOBUIL_gt PROPERTI
 				     																	       
 OTB_TEST_APPLICATION(NAME apTuCdComputePolylineFeatureFromImage_LI_NONDVI_wr
                      APP  ComputePolylineFeatureFromImage
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/NDVI.TIF
-                			 --vd ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/wrongroads.shp
-                			 --expr  "(b1 > 0.4)"
-  						     --field "NONDVI"
-                			 --out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_wr.shp)
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/NDVI.TIF
+                			 -vd ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/wrongroads.shp
+                			 -expr  "(b1 > 0.4)"
+  						     -field "NONDVI"
+                			 -out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_wr.shp)
                    
 OTB_TEST_APPLICATION(NAME apTuCdComputePolylineFeatureFromImage_LI_ROADSA_wr
                      APP  ComputePolylineFeatureFromImage
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/SpectralAngleRoad.TIF
-                			 --vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_wr.shp
-                			 --expr  "(b1 > 0.25)"
-  						     --field "ROADSA"
-                			 --out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_wr.shp)
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/SpectralAngleRoad.TIF
+                			 -vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_wr.shp
+                			 -expr  "(b1 > 0.25)"
+  						     -field "ROADSA"
+                			 -out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_wr.shp)
 
 OTB_TEST_APPLICATION(NAME apTvCdComputePolylineFeatureFromImage_LI_NOBUIL_wr
                      APP  ComputePolylineFeatureFromImage
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/BUILDINGS.TIF
-                			 --vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_wr.shp
-                			 --expr  "(b1 == 0)"
-  						     --field "NOBUIL"
-                			 --out ${TEMP}/cdTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/BUILDINGS.TIF
+                			 -vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_wr.shp
+                			 -expr  "(b1 == 0)"
+  						     -field "NOBUIL"
+                			 -out ${TEMP}/cdTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp
                      VALID	 --compare-ogr 0.0
                      		 ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp
                    			 ${TEMP}/cdTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp)
@@ -64,27 +64,27 @@ SET_TESTS_PROPERTIES(apTvCdComputePolylineFeatureFromImage_LI_NOBUIL_wr PROPERTI
 
 OTB_TEST_APPLICATION(NAME apTuCdComputePolylineFeatureFromImage_LI_NONDVI_RoadExtractionApplication
                      APP  ComputePolylineFeatureFromImage
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/NDVI.TIF
-                			 --vd ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/road_extraction.shp
-                			 --expr  "(b1 > 0.4)"
-  						     --field "NONDVI"
-                			 --out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_RoadExtractionApplication.shp)
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/NDVI.TIF
+                			 -vd ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/road_extraction.shp
+                			 -expr  "(b1 > 0.4)"
+  						     -field "NONDVI"
+                			 -out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_RoadExtractionApplication.shp)
                    
 OTB_TEST_APPLICATION(NAME apTuCdComputePolylineFeatureFromImage_LI_ROADSA_RoadExtractionApplication
                      APP  ComputePolylineFeatureFromImage
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/SpectralAngleRoad.TIF
-                			 --vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_RoadExtractionApplication.shp
-                			 --expr  "(b1 > 0.25)"
-  						     --field "ROADSA"
-                			 --out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_RoadExtractionApplication.shp)
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/SpectralAngleRoad.TIF
+                			 -vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_NONDVI_RoadExtractionApplication.shp
+                			 -expr  "(b1 > 0.25)"
+  						     -field "ROADSA"
+                			 -out ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_RoadExtractionApplication.shp)
 
 OTB_TEST_APPLICATION(NAME apTvCdComputePolylineFeatureFromImage_LI_NOBUIL_RoadExtractionApplication
                      APP  ComputePolylineFeatureFromImage
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/BUILDINGS.TIF
-                			 --vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_RoadExtractionApplication.shp
-                			 --expr  "(b1 == 0)"
-  						     --field "NOBUIL"
-                			 --out ${TEMP}/cdTvComputePolylineFeatureFromImage_LI_NOBUIL_RoadExtractionApplication.shp
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/BUILDINGS.TIF
+                			 -vd ${TEMP}/cdTuComputePolylineFeatureFromImage_LI_ROADSA_RoadExtractionApplication.shp
+                			 -expr  "(b1 == 0)"
+  						     -field "NOBUIL"
+                			 -out ${TEMP}/cdTvComputePolylineFeatureFromImage_LI_NOBUIL_RoadExtractionApplication.shp
                      VALID	 --compare-ogr 0.0
                      		 ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_RoadExtractionApplication.shp
                    			 ${TEMP}/cdTvComputePolylineFeatureFromImage_LI_NOBUIL_RoadExtractionApplication.shp)
@@ -98,35 +98,35 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 OTB_TEST_APPLICATION(NAME cdbTuDSFuzzyModelEstimation_LI
                      APP  DSFuzzyModelEstimation
-                     OPTIONS --psin ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp
-                		     --nsin ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp
-                		     --belsup "ROADSA" 
-                		     --plasup "NONDVI" "ROADSA" "NOBUIL" 
-                		     --initmod ${OTB_DATA_ROOT}/Input/Dempster-Shafer/DSFuzzyModel_Init.xml 
-                		     --maxnbit 4 
-                		     --optobs true
-                		     --out ${TEMP}/cdbTuDSFuzzyModelEstimatorOutput_LI.xml)
+                     OPTIONS -psin ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp
+                		     -nsin ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp
+                		     -belsup "ROADSA" 
+                		     -plasup "NONDVI" "ROADSA" "NOBUIL" 
+                		     -initmod ${OTB_DATA_ROOT}/Input/Dempster-Shafer/DSFuzzyModel_Init.xml 
+                		     -maxnbit 4 
+                		     -optobs true
+                		     -out ${TEMP}/cdbTuDSFuzzyModelEstimatorOutput_LI.xml)
 
 OTB_TEST_APPLICATION(NAME cdbTuDSFuzzyModelEstimation_LI_autoInit
                      APP  DSFuzzyModelEstimation
-                     OPTIONS --psin ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp
-                		     --nsin ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp
-                		     --belsup "ROADSA" 
-                		     --plasup "NONDVI" "ROADSA" "NOBUIL" 
-                		     --desclist "NONDVI" "ROADSA" "NOBUIL"
-                		     --maxnbit 4 
-                		     --optobs true
-                		     --out ${TEMP}/cdbTuDSFuzzyModelEstimatorOutput_LI_autoInit.xml)
+                     OPTIONS -psin ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp
+                		     -nsin ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp
+                		     -belsup "ROADSA" 
+                		     -plasup "NONDVI" "ROADSA" "NOBUIL" 
+                		     -desclist "NONDVI" "ROADSA" "NOBUIL"
+                		     -maxnbit 4 
+                		     -optobs true
+                		     -out ${TEMP}/cdbTuDSFuzzyModelEstimatorOutput_LI_autoInit.xml)
 
 
 
 OTB_TEST_APPLICATION(NAME cdbTvVectorDataDSValidationGroundTruth_LI
                      APP  VectorDataDSValidation
-                     OPTIONS --in ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp
-                		     --belsup "ROADSA" 
-                		     --plasup "NONDVI" "ROADSA" "NOBUIL" 
-                		     --descmod ${OTB_DATA_ROOT}/Input/Dempster-Shafer/DSFuzzyModel.xml 
-                		     --out ${TEMP}/cdbTvVectorDataDSValidationOutpout_LI_gt.shp
+                     OPTIONS -in ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp
+                		     -belsup "ROADSA" 
+                		     -plasup "NONDVI" "ROADSA" "NOBUIL" 
+                		     -descmod ${OTB_DATA_ROOT}/Input/Dempster-Shafer/DSFuzzyModel.xml 
+                		     -out ${TEMP}/cdbTvVectorDataDSValidationOutpout_LI_gt.shp
 					VALID	 --compare-ogr 0.0
 							 ${OTBAPP_BASELINE_FILES}/cdbTvVectorDataDSValidationOutpout_LI_gt.shp
 							 ${TEMP}/cdbTvVectorDataDSValidationOutpout_LI_gt.shp)
@@ -134,11 +134,11 @@ OTB_TEST_APPLICATION(NAME cdbTvVectorDataDSValidationGroundTruth_LI
 
 OTB_TEST_APPLICATION(NAME cdbTvVectorDataDSValidationWrongRoads_LI
                      APP  VectorDataDSValidation
-                     OPTIONS --in ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp
-                		     --belsup "ROADSA" 
-                		     --plasup "NONDVI" "ROADSA" "NOBUIL" 
-                		     --descmod ${OTB_DATA_ROOT}/Input/Dempster-Shafer/DSFuzzyModel.xml 
-                		     --out ${TEMP}/cdbTvVectorDataDSValidationOutpout_LI_wr.shp
+                     OPTIONS -in ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp
+                		     -belsup "ROADSA" 
+                		     -plasup "NONDVI" "ROADSA" "NOBUIL" 
+                		     -descmod ${OTB_DATA_ROOT}/Input/Dempster-Shafer/DSFuzzyModel.xml 
+                		     -out ${TEMP}/cdbTvVectorDataDSValidationOutpout_LI_wr.shp
 					VALID	 --compare-ogr 0.0
 							 ${OTBAPP_BASELINE_FILES}/cdbTvVectorDataDSValidationOutpout_LI_wr.shp
 							 ${TEMP}/cdbTvVectorDataDSValidationOutpout_LI_wr.shp)
@@ -146,11 +146,11 @@ OTB_TEST_APPLICATION(NAME cdbTvVectorDataDSValidationWrongRoads_LI
 
 OTB_TEST_APPLICATION(NAME cdbTuVectorDataDSValidationRoadExtractionApplication_LI
                      APP  VectorDataDSValidation
-                     OPTIONS --in ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_RoadExtractionApplication.shp
-                		     --belsup "ROADSA" 
-                		     --plasup "NONDVI" "ROADSA" "NOBUIL" 
-                		     --descmod ${OTB_DATA_ROOT}/Input/Dempster-Shafer/DSFuzzyModel.xml 
-                		     --out ${TEMP}/cdbTuVectorDataDSValidationOutpout_LI_RoadExtractionApplication.shp)
+                     OPTIONS -in ${OTBAPP_BASELINE_FILES}/cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_RoadExtractionApplication.shp
+                		     -belsup "ROADSA" 
+                		     -plasup "NONDVI" "ROADSA" "NOBUIL" 
+                		     -descmod ${OTB_DATA_ROOT}/Input/Dempster-Shafer/DSFuzzyModel.xml 
+                		     -out ${TEMP}/cdbTuVectorDataDSValidationOutpout_LI_RoadExtractionApplication.shp)
 					
 					
 							
diff --git a/Testing/Applications/ChangeDetection/CMakeLists.txt b/Testing/Applications/ChangeDetection/CMakeLists.txt
index 0c53a48528..702f2055df 100644
--- a/Testing/Applications/ChangeDetection/CMakeLists.txt
+++ b/Testing/Applications/ChangeDetection/CMakeLists.txt
@@ -3,9 +3,9 @@
 
 OTB_TEST_APPLICATION(NAME   apTvChMultivariateAlterationDetector
                      APP  MultivariateAlterationDetector
-                     OPTIONS --in1 ${INPUTDATA}/Spot5-Gloucester-before.tif
-                             --in2 ${INPUTDATA}/Spot5-Gloucester-after.tif
-                             --out ${TEMP}/apTvChMultivariateAlterationDetectorSameNbBands.tif
+                     OPTIONS -in1 ${INPUTDATA}/Spot5-Gloucester-before.tif
+                             -in2 ${INPUTDATA}/Spot5-Gloucester-after.tif
+                             -out ${TEMP}/apTvChMultivariateAlterationDetectorSameNbBands.tif
                      VALID   --compare-image 0.025
                              ${BASELINE}/cdTvMultivariateAlterationDetectorImageFilterOutputSameNbBands.tif
                   			 ${TEMP}/apTvChMultivariateAlterationDetectorSameNbBands.tif)
diff --git a/Testing/Applications/Classification/CMakeLists.txt b/Testing/Applications/Classification/CMakeLists.txt
index c5f11eaac8..1a7cd755fd 100644
--- a/Testing/Applications/Classification/CMakeLists.txt
+++ b/Testing/Applications/Classification/CMakeLists.txt
@@ -4,8 +4,8 @@
 
 OTB_TEST_APPLICATION(NAME apTvClComputeImagesStatisticsQB1
                      APP  ComputeImagesStatistics
-                     OPTIONS --il ${INPUTDATA}/Classification/QB_1_ortho.tif
-                			 --out ${TEMP}/apTvClEstimateImageStatisticsQB1.xml 
+                     OPTIONS -il ${INPUTDATA}/Classification/QB_1_ortho.tif
+                			 -out ${TEMP}/apTvClEstimateImageStatisticsQB1.xml 
                      VALID   --compare-ascii ${NOTOL}
                              ${OTBAPP_BASELINE_FILES}/clImageStatisticsQB1.xml
                              ${TEMP}/apTvClEstimateImageStatisticsQB1.xml )
@@ -13,12 +13,12 @@ OTB_TEST_APPLICATION(NAME apTvClComputeImagesStatisticsQB1
                         
 OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB1   
                      APP  TrainSVMImagesClassifier
-                     OPTIONS --io.il ${INPUTDATA}/Classification/QB_1_ortho.tif
-  							 --io.vd ${INPUTDATA}/Classification/VectorData_QB1.shp
-  							 --io.imstat ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
-  						     ##--sample.b 2
-					         --svm.opt true
-    						 --io.out ${TEMP}/clsvmModelQB1.svm
+                     OPTIONS -io.il ${INPUTDATA}/Classification/QB_1_ortho.tif
+  							 -io.vd ${INPUTDATA}/Classification/VectorData_QB1.shp
+  							 -io.imstat ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
+  						     ##-sample.b 2
+					         -svm.opt true
+    						 -io.out ${TEMP}/clsvmModelQB1.svm
                      VALID   --compare-ascii ${NOTOL}
                              ${OTBAPP_BASELINE_FILES}/clsvmModelQB1.svm
    					 		 ${TEMP}/clsvmModelQB1.svm)
@@ -27,15 +27,15 @@ SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1 PROPERTIES DEPENDS apTvCl
 
 OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB1_allOpt      
                      APP  TrainSVMImagesClassifier
-                     OPTIONS --io.il ${INPUTDATA}/Classification/QB_1_ortho.tif
-  						     --io.vd ${INPUTDATA}/Classification/VectorData_QB1.shp
- 							 --io.imstat ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
-  						     ##--sample.b 2
-  						     --sample.mv 100
-   							 --sample.mt 100
-    					     --sample.vtr 0.5
-    						 --svm.opt true
-    					     --io.out ${TEMP}/clsvmModelQB1_allOpt.svm
+                     OPTIONS -io.il ${INPUTDATA}/Classification/QB_1_ortho.tif
+  						     -io.vd ${INPUTDATA}/Classification/VectorData_QB1.shp
+ 							 -io.imstat ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
+  						     ##-sample.b 2
+  						     -sample.mv 100
+   							 -sample.mt 100
+    					     -sample.vtr 0.5
+    						 -svm.opt true
+    					     -io.out ${TEMP}/clsvmModelQB1_allOpt.svm
                      VALID   --compare-ascii ${NOTOL}
                              ${OTBAPP_BASELINE_FILES}/clsvmModelQB1.svm
    					 		 ${TEMP}/clsvmModelQB1_allOpt.svm)
@@ -45,11 +45,11 @@ SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1_allOpt PROPERTIES DEPENDS
 
 OTB_TEST_APPLICATION(NAME apTvClValidateSVMImagesClassifierQB1     
                      APP  ValidateSVMImagesClassifier
-                     OPTIONS --il     ${INPUTDATA}/Classification/QB_1_ortho.tif
-                             --vd     ${INPUTDATA}/Classification/VectorData_QB1_bis.shp
-     						 --imstat ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
-   							 --svm    ${TEMP}/clsvmModelQB1.svm
-   							 --out    ${TEMP}/clsvmPerformanceEstimationQB1.txt
+                     OPTIONS -il     ${INPUTDATA}/Classification/QB_1_ortho.tif
+                             -vd     ${INPUTDATA}/Classification/VectorData_QB1_bis.shp
+     						 -imstat ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
+   							 -svm    ${TEMP}/clsvmModelQB1.svm
+   							 -out    ${TEMP}/clsvmPerformanceEstimationQB1.txt
                      VALID   --compare-ascii ${NOTOL}
                              ${OTBAPP_BASELINE_FILES}/clsvmPerformanceEstimationQB1.txt
     						 ${TEMP}/clsvmPerformanceEstimationQB1.txt)
@@ -59,10 +59,10 @@ SET_TESTS_PROPERTIES(apTvClValidateSVMImagesClassifierQB1 PROPERTIES DEPENDS apT
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB1      
                      APP  ImageSVMClassifier
-                     OPTIONS --in      ${INPUTDATA}/Classification/QB_1_ortho.tif
-   							 --imstat  ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
-   							 --svm     ${TEMP}/clsvmModelQB1.svm
-  							 --out     ${TEMP}/clLabeledImageQB1.tif   
+                     OPTIONS -in      ${INPUTDATA}/Classification/QB_1_ortho.tif
+   							 -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
+   							 -svm     ${TEMP}/clsvmModelQB1.svm
+  							 -out     ${TEMP}/clLabeledImageQB1.tif   
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledImageQB1.tif
                              ${TEMP}/clLabeledImageQB1.tif)
@@ -71,10 +71,10 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB1 PROPERTIES DEPENDS apTvClTrainS
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB2      
                      APP  ImageSVMClassifier
-                     OPTIONS --in      ${INPUTDATA}/Classification/QB_2_ortho.tif
-   							 --imstat  ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
-   							 --svm     ${TEMP}/clsvmModelQB1.svm
-  							 --out     ${TEMP}/clLabeledImageQB2.tif   
+                     OPTIONS -in      ${INPUTDATA}/Classification/QB_2_ortho.tif
+   							 -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
+   							 -svm     ${TEMP}/clsvmModelQB1.svm
+  							 -out     ${TEMP}/clLabeledImageQB2.tif   
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledImageQB2.tif
                              ${TEMP}/clLabeledImageQB2.tif)
@@ -83,10 +83,10 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB2 PROPERTIES DEPENDS apTvClTrainS
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB3   
                      APP  ImageSVMClassifier
-                     OPTIONS --in      ${INPUTDATA}/Classification/QB_3_ortho.tif
-   							 --imstat  ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
-   							 --svm     ${TEMP}/clsvmModelQB1.svm
-  							 --out     ${TEMP}/clLabeledImageQB3.tif   
+                     OPTIONS -in      ${INPUTDATA}/Classification/QB_3_ortho.tif
+   							 -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
+   							 -svm     ${TEMP}/clsvmModelQB1.svm
+  							 -out     ${TEMP}/clLabeledImageQB3.tif   
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledImageQB3.tif
                              ${TEMP}/clLabeledImageQB3.tif)
@@ -98,10 +98,10 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB3 PROPERTIES DEPENDS apTvClTrainS
 
 OTB_TEST_APPLICATION(NAME apTvClComputeImagesStatisticsQB123
                      APP  ComputeImagesStatistics
-                     OPTIONS --il ${INPUTDATA}/Classification/QB_1_ortho.tif
+                     OPTIONS -il ${INPUTDATA}/Classification/QB_1_ortho.tif
                     			  ${INPUTDATA}/Classification/QB_2_ortho.tif
                    			      ${INPUTDATA}/Classification/QB_3_ortho.tif
-                			 --out ${TEMP}/apTvClEstimateImageStatisticsQB123.xml 
+                			 -out ${TEMP}/apTvClEstimateImageStatisticsQB123.xml 
                      VALID   --compare-ascii ${NOTOL}
                              ${OTBAPP_BASELINE_FILES}/clImageStatisticsQB123.xml
                              ${TEMP}/apTvClEstimateImageStatisticsQB123.xml)
@@ -109,16 +109,16 @@ OTB_TEST_APPLICATION(NAME apTvClComputeImagesStatisticsQB123
 
 OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB123   
                      APP  TrainSVMImagesClassifier
-                     OPTIONS --io.il ${INPUTDATA}/Classification/QB_1_ortho.tif
+                     OPTIONS -io.il ${INPUTDATA}/Classification/QB_1_ortho.tif
                     			  ${INPUTDATA}/Classification/QB_2_ortho.tif
                    			      ${INPUTDATA}/Classification/QB_3_ortho.tif              	
-							 --io.vd ${INPUTDATA}/Classification/VectorData_QB1.shp
+							 -io.vd ${INPUTDATA}/Classification/VectorData_QB1.shp
         						  ${INPUTDATA}/Classification/VectorData_QB2.shp
          						  ${INPUTDATA}/Classification/VectorData_QB3.shp
-    						 --io.imstat ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
-    						 #--sample.b 2
-   							 --svm.opt true
-    						 --io.out ${TEMP}/clsvmModelQB123.svm
+    						 -io.imstat ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
+    						 #-sample.b 2
+   							 -svm.opt true
+    						 -io.out ${TEMP}/clsvmModelQB123.svm
                      VALID   --compare-ascii ${NOTOL}
                              ${OTBAPP_BASELINE_FILES}/clsvmModelQB123.svm
    					 		 ${TEMP}/clsvmModelQB123.svm)
@@ -129,11 +129,11 @@ SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB123 PROPERTIES DEPENDS apTv
 
 OTB_TEST_APPLICATION(NAME apTvClValidateSVMImagesClassifierQB123     
                      APP  ValidateSVMImagesClassifier
-                     OPTIONS --il     ${INPUTDATA}/Classification/QB_1_ortho.tif
-                             --vd     ${INPUTDATA}/Classification/VectorData_QB1_bis.shp
-     						 --imstat ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
-   							 --svm    ${TEMP}/clsvmModelQB123.svm
-   							 --out    ${TEMP}/clsvmPerformanceEstimationQB123.txt
+                     OPTIONS -il     ${INPUTDATA}/Classification/QB_1_ortho.tif
+                             -vd     ${INPUTDATA}/Classification/VectorData_QB1_bis.shp
+     						 -imstat ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
+   							 -svm    ${TEMP}/clsvmModelQB123.svm
+   							 -out    ${TEMP}/clsvmPerformanceEstimationQB123.txt
                      VALID   --compare-ascii ${NOTOL}
                              ${OTBAPP_BASELINE_FILES}/clsvmPerformanceEstimationQB123.txt
     						 ${TEMP}/clsvmPerformanceEstimationQB123.txt)
@@ -143,10 +143,10 @@ SET_TESTS_PROPERTIES(apTvClValidateSVMImagesClassifierQB123 PROPERTIES DEPENDS a
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB123_1  
                      APP  ImageSVMClassifier
-                     OPTIONS --in      ${INPUTDATA}/Classification/QB_1_ortho.tif
-   							 --imstat  ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
-   							 --svm     ${TEMP}/clsvmModelQB123.svm
-  							 --out     ${TEMP}/clLabeledImageQB123_1.tif   
+                     OPTIONS -in      ${INPUTDATA}/Classification/QB_1_ortho.tif
+   							 -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
+   							 -svm     ${TEMP}/clsvmModelQB123.svm
+  							 -out     ${TEMP}/clLabeledImageQB123_1.tif   
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledImageQB123_1.tif
                              ${TEMP}/clLabeledImageQB123_1.tif)
@@ -156,10 +156,10 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB123_1 PROPERTIES DEPENDS apTvClTr
 
 OTB_TEST_APPLICATION(NAME apTvClLabeledImageColorMappingQB123_1   
                      APP   ColorMapping
-                     OPTIONS --in      ${TEMP}/clLabeledImageQB123_1.tif
-                             --method  custom
-                             --method.custom.lut ${INPUTDATA}/Classification/ColorTable.txt
-                             --out     ${TEMP}/clLabeledFancyImageQB123_1.tif
+                     OPTIONS -in      ${TEMP}/clLabeledImageQB123_1.tif
+                             -method  custom
+                             -method.custom.lut ${INPUTDATA}/Classification/ColorTable.txt
+                             -out     ${TEMP}/clLabeledFancyImageQB123_1.tif
    		             VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledFancyImageQB123_1.tif
    							 ${TEMP}/clLabeledFancyImageQB123_1.tif)
@@ -169,10 +169,10 @@ SET_TESTS_PROPERTIES(apTvClLabeledImageColorMappingQB123_1 PROPERTIES DEPENDS ap
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB123_2  
                      APP  ImageSVMClassifier
-                     OPTIONS --in      ${INPUTDATA}/Classification/QB_2_ortho.tif
-   							 --imstat  ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
-   							 --svm     ${TEMP}/clsvmModelQB123.svm
-  							 --out     ${TEMP}/clLabeledImageQB123_2.tif   
+                     OPTIONS -in      ${INPUTDATA}/Classification/QB_2_ortho.tif
+   							 -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
+   							 -svm     ${TEMP}/clsvmModelQB123.svm
+  							 -out     ${TEMP}/clLabeledImageQB123_2.tif   
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledImageQB123_2.tif
                              ${TEMP}/clLabeledImageQB123_2.tif)
@@ -181,10 +181,10 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB123_2 PROPERTIES DEPENDS apTvClTr
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB123_3  
                      APP  ImageSVMClassifier
-                     OPTIONS --in      ${INPUTDATA}/Classification/QB_3_ortho.tif
-   							 --imstat  ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
-   							 --svm     ${TEMP}/clsvmModelQB123.svm
-  							 --out     ${TEMP}/clLabeledImageQB123_3.tif   
+                     OPTIONS -in      ${INPUTDATA}/Classification/QB_3_ortho.tif
+   							 -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
+   							 -svm     ${TEMP}/clsvmModelQB123.svm
+  							 -out     ${TEMP}/clLabeledImageQB123_3.tif   
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledImageQB123_3.tif
                              ${TEMP}/clLabeledImageQB123_3.tif)
@@ -193,10 +193,10 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB123_3 PROPERTIES DEPENDS apTvClTr
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB123_6 
                      APP  ImageSVMClassifier
-                     OPTIONS --in      ${INPUTDATA}/Classification/QB_6_extract.tif
-   							 --imstat  ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
-   							 --svm     ${TEMP}/clsvmModelQB123.svm
-  							 --out     ${TEMP}/clLabeledImageQB123_6.tif   
+                     OPTIONS -in      ${INPUTDATA}/Classification/QB_6_extract.tif
+   							 -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB123.xml
+   							 -svm     ${TEMP}/clsvmModelQB123.svm
+  							 -out     ${TEMP}/clLabeledImageQB123_6.tif   
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledImageQB123_6.tif
    							 ${TEMP}/clLabeledImageQB123_6.tif)
@@ -205,26 +205,26 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB123_6 PROPERTIES DEPENDS apTvClTr
 
 OTB_TEST_APPLICATION(NAME apTvClComputeImagesStatisticsQB456
                      APP  ComputeImagesStatistics
-                     OPTIONS --il ${INPUTDATA}/Classification/QB_4_extract.tif
+                     OPTIONS -il ${INPUTDATA}/Classification/QB_4_extract.tif
                     			  ${INPUTDATA}/Classification/QB_5_extract.tif
                    			      ${INPUTDATA}/Classification/QB_6_extract.tif
-                			 --out ${TEMP}/apTvClEstimateImageStatisticsQB456.xml 
+                			 -out ${TEMP}/apTvClEstimateImageStatisticsQB456.xml 
                      VALID   --compare-ascii ${NOTOL}
                              ${OTBAPP_BASELINE_FILES}/clImageStatisticsQB456.xml
                              ${TEMP}/apTvClEstimateImageStatisticsQB456.xml)
    
 OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB456   
                      APP  TrainSVMImagesClassifier
-                     OPTIONS --io.il ${INPUTDATA}/Classification/QB_4_extract.tif
+                     OPTIONS -io.il ${INPUTDATA}/Classification/QB_4_extract.tif
                     			  ${INPUTDATA}/Classification/QB_5_extract.tif
                    			      ${INPUTDATA}/Classification/QB_6_extract.tif              	
-							 --io.vd ${INPUTDATA}/Classification/VectorData_QB4.shp
+							 -io.vd ${INPUTDATA}/Classification/VectorData_QB4.shp
         						  ${INPUTDATA}/Classification/VectorData_QB5.shp
          						  ${INPUTDATA}/Classification/VectorData_QB6.shp
-    						 --io.imstat ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
-    						 #--sample.b 2
-   							 --svm.opt true
-    						 --io.out ${TEMP}/clsvmModelQB456.svm
+    						 -io.imstat ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
+    						 #-sample.b 2
+   							 -svm.opt true
+    						 -io.out ${TEMP}/clsvmModelQB456.svm
                      VALID   --compare-ascii ${NOTOL}
                              ${OTBAPP_BASELINE_FILES}/clsvmModelQB456.svm
    					 		 ${TEMP}/clsvmModelQB456.svm)
@@ -235,11 +235,11 @@ SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB456 PROPERTIES DEPENDS apTv
 
 OTB_TEST_APPLICATION(NAME apTvClValidateSVMImagesClassifierQB456    
                      APP  ValidateSVMImagesClassifier
-                     OPTIONS --il     ${INPUTDATA}/Classification/QB_5_extract.tif
-                             --vd     ${INPUTDATA}/Classification/VectorData_QB5_bis.shp
-     						 --imstat ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
-   							 --svm    ${TEMP}/clsvmModelQB456.svm
-   							 --out    ${TEMP}/clsvmPerformanceEstimationQB456.txt
+                     OPTIONS -il     ${INPUTDATA}/Classification/QB_5_extract.tif
+                             -vd     ${INPUTDATA}/Classification/VectorData_QB5_bis.shp
+     						 -imstat ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
+   							 -svm    ${TEMP}/clsvmModelQB456.svm
+   							 -out    ${TEMP}/clsvmPerformanceEstimationQB456.txt
                      VALID   --compare-ascii ${NOTOL}
                              ${OTBAPP_BASELINE_FILES}/clsvmPerformanceEstimationQB456.txt
     						 ${TEMP}/clsvmPerformanceEstimationQB456.txt)
@@ -250,10 +250,10 @@ SET_TESTS_PROPERTIES(apTvClValidateSVMImagesClassifierQB456 PROPERTIES DEPENDS a
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB456_4  
                      APP  ImageSVMClassifier
-                     OPTIONS --in      ${INPUTDATA}/Classification/QB_4_extract.tif
-   							 --imstat  ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
-   							 --svm     ${TEMP}/clsvmModelQB456.svm
-  							 --out     ${TEMP}/clLabeledImageQB456_4.tif   
+                     OPTIONS -in      ${INPUTDATA}/Classification/QB_4_extract.tif
+   							 -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
+   							 -svm     ${TEMP}/clsvmModelQB456.svm
+  							 -out     ${TEMP}/clLabeledImageQB456_4.tif   
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledImageQB456_4.tif
                              ${TEMP}/clLabeledImageQB456_4.tif)
@@ -262,10 +262,10 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB456_4 PROPERTIES DEPENDS apTvClTr
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB456_5  
                      APP  ImageSVMClassifier
-                     OPTIONS --in      ${INPUTDATA}/Classification/QB_5_extract.tif
-   							 --imstat  ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
-   							 --svm     ${TEMP}/clsvmModelQB456.svm
-  							 --out     ${TEMP}/clLabeledImageQB456_5.tif   
+                     OPTIONS -in      ${INPUTDATA}/Classification/QB_5_extract.tif
+   							 -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
+   							 -svm     ${TEMP}/clsvmModelQB456.svm
+  							 -out     ${TEMP}/clLabeledImageQB456_5.tif   
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledImageQB456_5.tif
                              ${TEMP}/clLabeledImageQB456_5.tif)
@@ -275,11 +275,11 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB456_5 PROPERTIES DEPENDS apTvClTr
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB456_6  
                      APP  ImageSVMClassifier
-                     OPTIONS --in      ${INPUTDATA}/Classification/QB_6_extract.tif
-                             --mask   ${INPUTDATA}/Classification/QB_6_mask.tif
-   							 --imstat  ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
-   							 --svm     ${TEMP}/clsvmModelQB456.svm
-  							 --out     ${TEMP}/clLabeledImageQB456_6.tif   
+                     OPTIONS -in      ${INPUTDATA}/Classification/QB_6_extract.tif
+                             -mask   ${INPUTDATA}/Classification/QB_6_mask.tif
+   							 -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
+   							 -svm     ${TEMP}/clsvmModelQB456.svm
+  							 -out     ${TEMP}/clLabeledImageQB456_6.tif   
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledImageQB456_6.tif
                              ${TEMP}/clLabeledImageQB456_6.tif)
@@ -289,10 +289,10 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB456_6 PROPERTIES DEPENDS apTvClTr
 
 OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB456_1
                      APP  ImageSVMClassifier
-                     OPTIONS --in      ${INPUTDATA}/Classification/QB_1_ortho.tif
-   							 --imstat  ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
-   							 --svm     ${TEMP}/clsvmModelQB456.svm
-  							 --out     ${TEMP}/clLabeledImageQB456_1.tif   
+                     OPTIONS -in      ${INPUTDATA}/Classification/QB_1_ortho.tif
+   							 -imstat  ${TEMP}/apTvClEstimateImageStatisticsQB456.xml
+   							 -svm     ${TEMP}/clsvmModelQB456.svm
+  							 -out     ${TEMP}/clLabeledImageQB456_1.tif   
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/clLabeledImageQB456_1.tif
                              ${TEMP}/clLabeledImageQB456_1.tif)
@@ -302,14 +302,14 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB456_1 PROPERTIES DEPENDS apTvClTr
 
 OTB_TEST_APPLICATION(NAME apTvClKMeansImageClassification
                      APP  KMeansClassification
-                     OPTIONS --in ${INPUTDATA}/poupees_sub.png
-                 			 --vm ${INPUTDATA}/mask_KMeans.png 
-                             --ts 100 
-                   			 --tp 0.6 
-                 			 --nc 5 
-                 			 --cp 0.9 
-                 			 --sl 100
-                 			 --out ${TEMP}/apTvClKMeansImageClassificationFilterOuptut.tif 
+                     OPTIONS -in ${INPUTDATA}/poupees_sub.png
+                 			 -vm ${INPUTDATA}/mask_KMeans.png 
+                             -ts 100 
+                   			 -tp 0.6 
+                 			 -nc 5 
+                 			 -cp 0.9 
+                 			 -sl 100
+                 			 -out ${TEMP}/apTvClKMeansImageClassificationFilterOuptut.tif 
                      VALID   --compare-image ${NOTOL}
                              ${OTBAPP_BASELINE}/apTvClKMeansImageClassificationFilterOuptut.tif
                              ${TEMP}/apTvClKMeansImageClassificationFilterOuptut.tif )
diff --git a/Testing/Applications/DimensionnalityReduction/CMakeLists.txt b/Testing/Applications/DimensionnalityReduction/CMakeLists.txt
index 4a4170861d..9321a1e868 100644
--- a/Testing/Applications/DimensionnalityReduction/CMakeLists.txt
+++ b/Testing/Applications/DimensionnalityReduction/CMakeLists.txt
@@ -3,8 +3,8 @@
 
 OTB_TEST_APPLICATION(NAME   apTvChMaximumAutocorrelationFactor
                      APP  MaximumAutocorrelationFactor
-                     OPTIONS --in ${INPUTDATA}/cupriteSubHsi.tif
-                             --out ${TEMP}/apTvChMaximumAutocorrelationFactor.tif
+                     OPTIONS -in ${INPUTDATA}/cupriteSubHsi.tif
+                             -out ${TEMP}/apTvChMaximumAutocorrelationFactor.tif
                      VALID   --compare-image 0.025
                              ${BASELINE}/bfTvMaximumAutocorrelationFactorImageFilterOutput.tif
                              ${TEMP}/apTvChMaximumAutocorrelationFactor.tif)
diff --git a/Testing/Applications/DisparityMap/CMakeLists.txt b/Testing/Applications/DisparityMap/CMakeLists.txt
index f93c90838c..e2b803fa52 100644
--- a/Testing/Applications/DisparityMap/CMakeLists.txt
+++ b/Testing/Applications/DisparityMap/CMakeLists.txt
@@ -4,36 +4,36 @@ SET(EPSILON_10 0.0000000001)
 
 OTB_TEST_APPLICATION(NAME  apTvDmStereoSensorModelToElevationMapTest
                      APP  StereoSensorModelToElevationMap
-                     OPTIONS --ref ${INPUTDATA}/sensor_stereo_left.tif
-                             --sec ${INPUTDATA}/sensor_stereo_right.tif
-                             --out ${TEMP}/apTvDmStereoSensorModelToElevationMapTest.tif
-                             --r 3
-                             --ct 0.7
-                             --vt 4.0
-                             --minh -20.0
-                             --maxh 20.0
-                             --step 1.0
-                             --dem ${INPUTDATA}/DEM/srtm_directory/
-                             --geoid ${INPUTDATA}/DEM/egm96.grd
+                     OPTIONS -ref ${INPUTDATA}/sensor_stereo_left.tif
+                             -sec ${INPUTDATA}/sensor_stereo_right.tif
+                             -out ${TEMP}/apTvDmStereoSensorModelToElevationMapTest.tif
+                             -r 3
+                             -ct 0.7
+                             -vt 4.0
+                             -minh -20.0
+                             -maxh 20.0
+                             -step 1.0
+                             -dem ${INPUTDATA}/DEM/srtm_directory/
+                             -geoid ${INPUTDATA}/DEM/egm96.grd
                      VALID   --compare-image ${EPSILON_10}
                              ${BASELINE}/apTvDmStereoSensorModelToElevationMapTest.tif
                              ${TEMP}/apTvDmStereoSensorModelToElevationMapTest.tif)
 
 OTB_TEST_APPLICATION(NAME  apTvDmStereoSensorModelToElevationMapWithSmoothing
                      APP  StereoSensorModelToElevationMap
-                     OPTIONS --ref ${INPUTDATA}/sensor_stereo_left.tif
-                             --sec ${INPUTDATA}/sensor_stereo_right.tif
-                             --out ${TEMP}/apTvDmStereoSensorModelToElevationMapWithSmoothing.tif
-                             --r 3
-                             --ct 0.7
-                             --vt 4.0
-                             --minh -20.0
-                             --maxh 20.0
-                             --step 1.0
-                             --dem ${INPUTDATA}/DEM/srtm_directory/
-                             --geoid ${INPUTDATA}/DEM/egm96.grd
-                             --rgs 2.0
-                             --sgs 2.0
+                     OPTIONS -ref ${INPUTDATA}/sensor_stereo_left.tif
+                             -sec ${INPUTDATA}/sensor_stereo_right.tif
+                             -out ${TEMP}/apTvDmStereoSensorModelToElevationMapWithSmoothing.tif
+                             -r 3
+                             -ct 0.7
+                             -vt 4.0
+                             -minh -20.0
+                             -maxh 20.0
+                             -step 1.0
+                             -dem ${INPUTDATA}/DEM/srtm_directory/
+                             -geoid ${INPUTDATA}/DEM/egm96.grd
+                             -rgs 2.0
+                             -sgs 2.0
                      VALID   --compare-image ${EPSILON_10}
                              ${BASELINE}/apTvDmStereoSensorModelToElevationMapWithSmoothing.tif
                              ${TEMP}/apTvDmStereoSensorModelToElevationMapWithSmoothing.tif)
@@ -41,18 +41,18 @@ OTB_TEST_APPLICATION(NAME  apTvDmStereoSensorModelToElevationMapWithSmoothing
 #--- FineRegistration ---#
 OTB_TEST_APPLICATION(NAME apTvDmFineRegistrationTest
                      APP  FineRegistration
-                     OPTIONS --ref ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
-                             --sec ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_centered_rigid.tif
-                             --out ${TEMP}/apTvDmFineRegistrationTest.tif
-                             --erx 5
-                             --ery 5
-                             --mrx 3
-                             --mry 3
-                             --ssrx 8
-                             --ssry 8
-                             --spa 0.1
-                             --cox -2
-                             --vmlt 0.999
+                     OPTIONS -ref ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
+                             -sec ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_centered_rigid.tif
+                             -out ${TEMP}/apTvDmFineRegistrationTest.tif
+                             -erx 5
+                             -ery 5
+                             -mrx 3
+                             -mry 3
+                             -ssrx 8
+                             -ssry 8
+                             -spa 0.1
+                             -cox -2
+                             -vmlt 0.999
                      VALID   --compare-image ${EPSILON_10}
                              ${BASELINE}/apTvDmFineRegistrationTest.tif
                              ${TEMP}/apTvDmFineRegistrationTest.tif
diff --git a/Testing/Applications/FeatureExtraction/CMakeLists.txt b/Testing/Applications/FeatureExtraction/CMakeLists.txt
index 9e3aadfe34..ae8642f6fa 100644
--- a/Testing/Applications/FeatureExtraction/CMakeLists.txt
+++ b/Testing/Applications/FeatureExtraction/CMakeLists.txt
@@ -5,16 +5,16 @@ IF(OTB_DATA_USE_LARGEINPUT)
 
 OTB_TEST_APPLICATION(NAME   apTvFeLineSegmentDetection
                      APP  LineSegmentDetection
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/ROI_QB_TOULOUSE.TIF
-                             --out ${TEMP}/feTvLineSegmentDetection_LI.shp
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/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)
     
 OTB_TEST_APPLICATION(NAME   apTvFeLineSegmentDetectionNoRescale
                      APP  LineSegmentDetection
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/ROI_QB_TOULOUSE.TIF
-                             --out ${TEMP}/feTvLineSegmentDetection_LI_NoRescale.shp
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/ROI_QB_TOULOUSE.TIF
+                             -out ${TEMP}/feTvLineSegmentDetection_LI_NoRescale.shp
                      VALID   --compare-ogr ${EPSILON_9}
                              ${OTBAPP_BASELINE_FILES}/feTvLineSegmentDetection_LI_NoRescale.shp
                              ${TEMP}/feTvLineSegmentDetection_LI_NoRescale.shp)
diff --git a/Testing/Applications/Hyperspectral/CMakeLists.txt b/Testing/Applications/Hyperspectral/CMakeLists.txt
index c116a654b0..1b91b99bac 100644
--- a/Testing/Applications/Hyperspectral/CMakeLists.txt
+++ b/Testing/Applications/Hyperspectral/CMakeLists.txt
@@ -3,20 +3,20 @@
 
 OTB_TEST_APPLICATION(NAME  apTvHyHyperspectralUnmixing_UCLS
                      APP  HyperspectralUnmixing
-                     OPTIONS --in ${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
-                			 --ie ${INPUTDATA}/Hyperspectral/synthetic/endmembers.tif
-                 			 --out ${TEMP}/apTvHyHyperspectralUnmixing_UCLS.tif double
-                 			 --ua ucls 
+                     OPTIONS -in ${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
+                			 -ie ${INPUTDATA}/Hyperspectral/synthetic/endmembers.tif
+                 			 -out ${TEMP}/apTvHyHyperspectralUnmixing_UCLS.tif double
+                 			 -ua ucls 
                      VALID   --compare-image ${EPSILON_9}
                               ${BASELINE}/apTvHyHyperspectralUnmixing_UCLS.tif
                   			  ${TEMP}/apTvHyHyperspectralUnmixing_UCLS.tif)
 
 OTB_TEST_APPLICATION(NAME  apTvHyHyperspectralUnmixing_NCLS
                      APP  HyperspectralUnmixing
-                     OPTIONS --in ${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
-                			 --ie ${INPUTDATA}/Hyperspectral/synthetic/endmembers.tif
-                 			 --out ${TEMP}/apTvHyHyperspectralUnmixing_NCLS.tif double
-                 			 --ua ncls 
+                     OPTIONS -in ${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
+                			 -ie ${INPUTDATA}/Hyperspectral/synthetic/endmembers.tif
+                 			 -out ${TEMP}/apTvHyHyperspectralUnmixing_NCLS.tif double
+                 			 -ua ncls 
                      VALID   --compare-image ${EPSILON_9}
                               ${BASELINE}/apTvHyHyperspectralUnmixing_NCLS.tif
                   			  ${TEMP}/apTvHyHyperspectralUnmixing_NCLS.tif)
@@ -30,17 +30,17 @@ OTB_TEST_APPLICATION(NAME  apTvHyHyperspectralUnmixing_NCLS
 #                 Execute $<TARGET_FILE:otbApplicationLauncherCommandLine>
 #                 HyperspectralUnmixing
 #                 $<TARGET_FILE_DIR:otbapp_HyperspectralUnmixing>
-#                 --in ${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
-#                 --ie ${INPUTDATA}/Hyperspectral/synthetic/endmembers.tif
-#                 --out ${TEMP}/apTvHyHyperspectralUnmixing_ISRA.tif double
-#                 --ua isra )
+#                 -in ${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
+#                 -ie ${INPUTDATA}/Hyperspectral/synthetic/endmembers.tif
+#                 -out ${TEMP}/apTvHyHyperspectralUnmixing_ISRA.tif double
+#                 -ua isra )
                 
 OTB_TEST_APPLICATION(NAME  apTvHyHyperspectralUnmixing_FCLS
                      APP  HyperspectralUnmixing
-                     OPTIONS --in ${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
-                			 --ie ${INPUTDATA}/Hyperspectral/synthetic/endmembers.tif
-                 			 --out ${TEMP}/apTvHyHyperspectralUnmixing_FCLS.tif double
-                 			 --ua fcls 
+                     OPTIONS -in ${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
+                			 -ie ${INPUTDATA}/Hyperspectral/synthetic/endmembers.tif
+                 			 -out ${TEMP}/apTvHyHyperspectralUnmixing_FCLS.tif double
+                 			 -ua fcls 
                      VALID   --compare-image ${EPSILON_9}
                               ${BASELINE}/apTvHyHyperspectralUnmixing_FCLS.tif
                   			  ${TEMP}/apTvHyHyperspectralUnmixing_FCLS.tif)
@@ -48,9 +48,9 @@ OTB_TEST_APPLICATION(NAME  apTvHyHyperspectralUnmixing_FCLS
 #--- VertexComponentAnalysis ---#
 OTB_TEST_APPLICATION(NAME  apTvHyVertexComponentAnalysis
                      APP  VertexComponentAnalysis
-                     OPTIONS --in ${OTB_DATA_ROOT}/Input/Hyperspectral/synthetic/hsi_cube.tif
-                             --ne 5
-                 	     --outendm ${TEMP}/apTvHyVertexComponentAnalysis.tif double
+                     OPTIONS -in ${OTB_DATA_ROOT}/Input/Hyperspectral/synthetic/hsi_cube.tif
+                             -ne 5
+                 	     -outendm ${TEMP}/apTvHyVertexComponentAnalysis.tif double
                              VALID   --compare-image ${EPSILON_9}
                                      ${BASELINE}/apTvHyVertexComponentAnalysis.tif
                   	             ${TEMP}/apTvHyVertexComponentAnalysis.tif
diff --git a/Testing/Applications/Projections/CMakeLists.txt b/Testing/Applications/Projections/CMakeLists.txt
index 25a642c8b0..ed708b6e89 100644
--- a/Testing/Applications/Projections/CMakeLists.txt
+++ b/Testing/Applications/Projections/CMakeLists.txt
@@ -3,17 +3,17 @@ IF(OTB_DATA_USE_LARGEINPUT)
 
 OTB_TEST_APPLICATION(NAME  apTvPrOrthorectification_UTM
                      APP  OrthoRectification
-                     OPTIONS --io.in ${OTB_DATA_LARGEINPUT_ROOT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
-                 			 --io.out ${TEMP}/apTvPrOrthorectifTest_UTM.tif
-                 			 --elev.dem ${INPUTDATA}/DEM/srtm_directory/
-                 		     --outputs.ulx  374100.8
-                 			 --outputs.uly  4829184.8
-                 			 --outputs.sizex 500
-                 			 --outputs.sizey 500
-                 			 --outputs.spacingx  0.5
-                 			 --outputs.spacingy  -0.5
-                 			 --map utm
-                 			 --opt.gridspacing 4 # Spacing of the deformation field
+                     OPTIONS -io.in ${OTB_DATA_LARGEINPUT_ROOT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
+                 			 -io.out ${TEMP}/apTvPrOrthorectifTest_UTM.tif
+                 			 -elev.dem ${INPUTDATA}/DEM/srtm_directory/
+                 		     -outputs.ulx  374100.8
+                 			 -outputs.uly  4829184.8
+                 			 -outputs.sizex 500
+                 			 -outputs.sizey 500
+                 			 -outputs.spacingx  0.5
+                 			 -outputs.spacingy  -0.5
+                 			 -map utm
+                 			 -opt.gridspacing 4 # Spacing of the deformation field
                      VALID   --compare-image ${NOTOL}
                               ${BASELINE}/owTvOrthorectifTest_UTM.tif
                  			  ${TEMP}/apTvPrOrthorectifTest_UTM.tif)
@@ -22,10 +22,10 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 OTB_TEST_APPLICATION(NAME apTvPrRigidTransformResample
                      APP  RigidTransformResample
-                     OPTIONS --in ${INPUTDATA}/poupees.tif
-                 			 --out ${TEMP}/apTvPrRigidTransformResampleTest.tif
-		 					 --tx 5 
-							 --ty -5
+                     OPTIONS -in ${INPUTDATA}/poupees.tif
+                 			 -out ${TEMP}/apTvPrRigidTransformResampleTest.tif
+		 					 -tx 5 
+							 -ty -5
                      VALID   --compare-image ${NOTOL}
                               ${BASELINE}/owTvRigidTransformResampleTest.tif
                 			  ${TEMP}/apTvPrRigidTransformResampleTest.tif)
@@ -33,11 +33,11 @@ OTB_TEST_APPLICATION(NAME apTvPrRigidTransformResample
 
 OTB_TEST_APPLICATION(NAME  apTvPrConvertCartoToGeoPoint
                      APP  ConvertCartoToGeoPoint
-                     OPTIONS --carto.x 374100.828
-                             --carto.y 4829184.806
-                 	     --mapproj utm
-                 	     --mapproj.utm.hemisphere true
-                 	     --mapproj.utm.zone 31
+                     OPTIONS -carto.x 374100.828
+                             -carto.y 4829184.806
+                 	     -mapproj utm
+                 	     -mapproj.utm.hemisphere true
+                 	     -mapproj.utm.zone 31
                      TESTENVOPTIONS ${TEMP}/apTvPrConvertCartoToGeoPoint.txt
                      VALID   --compare-ascii ${EPSILON_7}
                              ${BASELINE_FILES}/apTvPrConvertCartoToGeoPoint.txt
@@ -45,13 +45,13 @@ OTB_TEST_APPLICATION(NAME  apTvPrConvertCartoToGeoPoint
 
 OTB_TEST_APPLICATION(NAME apTvPrImageEnvelopeTest
                      APP ImageEnvelope
-                     OPTIONS --in ${INPUTDATA}/sensor_stereo_left.tif
-                             --out ${TEMP}/apTvPrImageEnvelopeTest.shp)
+                     OPTIONS -in ${INPUTDATA}/sensor_stereo_left.tif
+                             -out ${TEMP}/apTvPrImageEnvelopeTest.shp)
 
 OTB_TEST_APPLICATION(NAME apTvPrObtainUTMZoneFromGeoPoint
                      APP ObtainUTMZoneFromGeoPoint
-                     OPTIONS --lat 10.0
-                             --lon 124.0
+                     OPTIONS -lat 10.0
+                             -lon 124.0
                      TESTENVOPTIONS ${TEMP}/apTvPrObtainUTMZoneFromGeoPoint.txt
                      VALID  --compare-ascii ${EPSILON_7}
                         ${BASELINE_FILES}/apTvPrObtainUTMZoneFromGeoPoint.txt
diff --git a/Testing/Applications/RadiometricIndices/CMakeLists.txt b/Testing/Applications/RadiometricIndices/CMakeLists.txt
index 2be81c73a2..04d34cafdd 100644
--- a/Testing/Applications/RadiometricIndices/CMakeLists.txt
+++ b/Testing/Applications/RadiometricIndices/CMakeLists.txt
@@ -4,11 +4,11 @@ set(TEST_DRIVER otbTestDriver
 
 OTB_TEST_APPLICATION(NAME  apTvRIRadiometricVegetationIndices
                      APP  RadiometricVegetationIndices
-                     OPTIONS --in ${INPUTDATA}/veryverySmallFSATSW.tif
-                             --index.ndvi 1 
-                             --index.rvi 1 
-                             --index.ipvi 1
-                             --out ${TEMP}/apTvRIRadiometricVegetationIndices.tif
+                     OPTIONS -in ${INPUTDATA}/veryverySmallFSATSW.tif
+                             -index.ndvi 1 
+                             -index.rvi 1 
+                             -index.ipvi 1
+                             -out ${TEMP}/apTvRIRadiometricVegetationIndices.tif
                      VALID   --compare-image ${NOTOL}
                    			 ${BASELINE}/apTvRIRadiometricVegetationIndices.tif
                  		     ${TEMP}/apTvRIRadiometricVegetationIndices.tif)
diff --git a/Testing/Applications/Radiometry/CMakeLists.txt b/Testing/Applications/Radiometry/CMakeLists.txt
index 73f6a32598..cb33f05a1f 100644
--- a/Testing/Applications/Radiometry/CMakeLists.txt
+++ b/Testing/Applications/Radiometry/CMakeLists.txt
@@ -1,63 +1,63 @@
 
 OTB_TEST_APPLICATION(NAME apTvRaOpticalCalibration_QuickbirdPAN
                      APP  OpticalCalibration
-                     OPTIONS --in ${INPUTDATA}/QB_PAN_ROI_1000_100.tif
-                             --level toa
-                             --out ${TEMP}/apTvRaOpticalCalibration_QuickbirdPAN.tif
+                     OPTIONS -in ${INPUTDATA}/QB_PAN_ROI_1000_100.tif
+                             -level toa
+                             -out ${TEMP}/apTvRaOpticalCalibration_QuickbirdPAN.tif
                      VALID   --compare-image ${EPSILON_7}
                              ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdPAN.tif
                              ${TEMP}/apTvRaOpticalCalibration_QuickbirdPAN.tif )
 
 OTB_TEST_APPLICATION(NAME apTvRaOpticalCalibration_QuickbirdXS
                      APP  OpticalCalibration
-                     OPTIONS --in ${INPUTDATA}/QB_MUL_ROI_1000_100.tif
-                             --level toa
-                             --out ${TEMP}/apTvRaOpticalCalibration_QuickbirdXS.tif
+                     OPTIONS -in ${INPUTDATA}/QB_MUL_ROI_1000_100.tif
+                             -level toa
+                             -out ${TEMP}/apTvRaOpticalCalibration_QuickbirdXS.tif
                      VALID   --compare-image ${EPSILON_7}
                              ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoQuickbirdXS.tif
                              ${TEMP}/apTvRaOpticalCalibration_QuickbirdXS.tif )
 
 OTB_TEST_APPLICATION(NAME apTvRaOpticalCalibration_Spot5
                      APP  OpticalCalibration
-                     OPTIONS --in ${INPUTDATA}/SPOT5_ROI_1000_100.tif
-                             --level toa
-                             --out ${TEMP}/apTvRaOpticalCalibration_Spot5.tif
+                     OPTIONS -in ${INPUTDATA}/SPOT5_ROI_1000_100.tif
+                             -level toa
+                             -out ${TEMP}/apTvRaOpticalCalibration_Spot5.tif
                      VALID   --compare-image ${EPSILON_7}
                              ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoSpot5.tif
                              ${TEMP}/apTvRaOpticalCalibration_Spot5.tif )
 
 OTB_TEST_APPLICATION(NAME apTvRaOpticalCalibration_Ikonos
                      APP  OpticalCalibration
-                     OPTIONS --in ${INPUTDATA}/IKONOS_BLOSSEVILLE_ROI_1000_100.tif
-                             --level toa
-                             --out ${TEMP}/apTvRaOpticalCalibration_Ikonos.tif
+                     OPTIONS -in ${INPUTDATA}/IKONOS_BLOSSEVILLE_ROI_1000_100.tif
+                             -level toa
+                             -out ${TEMP}/apTvRaOpticalCalibration_Ikonos.tif
                      VALID   --compare-image ${EPSILON_7}
                              ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoIkonos.tif
                              ${TEMP}/apTvRaOpticalCalibration_Ikonos.tif )
 
 OTB_TEST_APPLICATION(NAME apTvRaOpticalCalibration_WV2PAN
                      APP  OpticalCalibration
-                     OPTIONS --in ${INPUTDATA}/WV2_PAN_ROI_1000_100.tif
-                             --level toa
-                             --out ${TEMP}/apTvRaOpticalCalibration_WV2PAN.tif
+                     OPTIONS -in ${INPUTDATA}/WV2_PAN_ROI_1000_100.tif
+                             -level toa
+                             -out ${TEMP}/apTvRaOpticalCalibration_WV2PAN.tif
                      VALID   --compare-image ${EPSILON_7}
                              ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoWV2PAN.tif
                              ${TEMP}/apTvRaOpticalCalibration_WV2PAN.tif )
 
 OTB_TEST_APPLICATION(NAME apTvRaOpticalCalibration_WV2Multi
                      APP  OpticalCalibration
-                     OPTIONS --in ${INPUTDATA}/WV2_MUL_ROI_1000_100.tif
-                             --level toa
-                             --out ${TEMP}/apTvRaOpticalCalibration_WV2Multi.tif
+                     OPTIONS -in ${INPUTDATA}/WV2_MUL_ROI_1000_100.tif
+                             -level toa
+                             -out ${TEMP}/apTvRaOpticalCalibration_WV2Multi.tif
                      VALID   --compare-image ${EPSILON_7}
                              ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoWV2Multi.tif
                              ${TEMP}/apTvRaOpticalCalibration_WV2Multi.tif )
 
 OTB_TEST_APPLICATION(NAME apTvRaOpticalCalibration_Formosat
                      APP  OpticalCalibration
-                     OPTIONS --in ${INPUTDATA}/FORMOSAT_ROI_1000_100.tif
-                             --level toa
-                             --out ${TEMP}/apTvRaOpticalCalibration_Formosat.tif
+                     OPTIONS -in ${INPUTDATA}/FORMOSAT_ROI_1000_100.tif
+                             -level toa
+                             -out ${TEMP}/apTvRaOpticalCalibration_Formosat.tif
                      VALID   --compare-image ${EPSILON_7}
                              ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoFormosat.tif
                              ${TEMP}/apTvRaOpticalCalibration_Formosat.tif )
diff --git a/Testing/Applications/Rasterization/CMakeLists.txt b/Testing/Applications/Rasterization/CMakeLists.txt
index a89633965f..756e68af74 100644
--- a/Testing/Applications/Rasterization/CMakeLists.txt
+++ b/Testing/Applications/Rasterization/CMakeLists.txt
@@ -4,28 +4,28 @@ IF( OTB_DATA_USE_LARGEINPUT )
 
 OTB_TEST_APPLICATION(NAME apTvRsRasterizationLines
                      APP  Rasterization
-                     OPTIONS --in   ${LARGEDATA}/VECTOR/MidiPyrenees/Roads.shp
-                             --im   ${BASELINE}/apTvRsRasterizationLines.tif
-                 			 --out  ${TEMP}/apTvRsRasterizationLines.tif uint8
+                     OPTIONS -in   ${LARGEDATA}/VECTOR/MidiPyrenees/Roads.shp
+                             -im   ${BASELINE}/apTvRsRasterizationLines.tif
+                 			 -out  ${TEMP}/apTvRsRasterizationLines.tif uint8
                      VALID   --compare-image ${NOTOL}
                               ${BASELINE}/apTvRsRasterizationLines.tif
                 			  ${TEMP}/apTvRsRasterizationLines.tif)
 
 OTB_TEST_APPLICATION(NAME apTvRsRasterizationLinesStreaming
                      APP  Rasterization
-                     OPTIONS --in   ${LARGEDATA}/VECTOR/MidiPyrenees/Roads.shp
-                             --im   ${BASELINE}/apTvRsRasterizationLines.tif
-                 			 --out  ${TEMP}/apTvRsRasterizationLinesStreaming.tif uint8
-                 			 --ram 1
+                     OPTIONS -in   ${LARGEDATA}/VECTOR/MidiPyrenees/Roads.shp
+                             -im   ${BASELINE}/apTvRsRasterizationLines.tif
+                 			 -out  ${TEMP}/apTvRsRasterizationLinesStreaming.tif uint8
+                 			 -ram 1
                      VALID   --compare-image ${NOTOL}
                               ${BASELINE}/apTvRsRasterizationLines.tif
                 			  ${TEMP}/apTvRsRasterizationLinesStreaming.tif)
 
 OTB_TEST_APPLICATION(NAME apTvRsRasterizationPoints
                      APP  Rasterization
-                     OPTIONS --in   ${LARGEDATA}/VECTOR/MidiPyrenees/points.shp
-                             --im   ${BASELINE}/apTvRsRasterizationPoints.tif
-                 			 --out  ${TEMP}/apTvRsRasterizationPoints.tif uint8
+                     OPTIONS -in   ${LARGEDATA}/VECTOR/MidiPyrenees/points.shp
+                             -im   ${BASELINE}/apTvRsRasterizationPoints.tif
+                 			 -out  ${TEMP}/apTvRsRasterizationPoints.tif uint8
                      VALID   --compare-image ${NOTOL}
                               ${BASELINE}/apTvRsRasterizationPoints.tif
                 			  ${TEMP}/apTvRsRasterizationPoints.tif)
@@ -34,10 +34,10 @@ ENDIF( OTB_DATA_USE_LARGEINPUT )
 
 OTB_TEST_APPLICATION(NAME apTvRsRasterizationPolygons
                      APP  Rasterization
-                     OPTIONS --in   ${INPUTDATA}/Rasterization/polgons.shp
-                             --szx 1100
-                             --szy 1100
-                 			 --out  ${TEMP}/apTvRsRasterizationPolygons.tif uint8
+                     OPTIONS -in   ${INPUTDATA}/Rasterization/polgons.shp
+                             -szx 1100
+                             -szy 1100
+                 			 -out  ${TEMP}/apTvRsRasterizationPolygons.tif uint8
                      VALID   --compare-image ${NOTOL}
                               ${BASELINE}/apTvRsRasterizationPolygons.tif
                 			  ${TEMP}/apTvRsRasterizationPolygons.tif)
diff --git a/Testing/Applications/Segmentation/CMakeLists.txt b/Testing/Applications/Segmentation/CMakeLists.txt
index b60332da0b..d198fc2749 100644
--- a/Testing/Applications/Segmentation/CMakeLists.txt
+++ b/Testing/Applications/Segmentation/CMakeLists.txt
@@ -2,15 +2,15 @@
 
 OTB_TEST_APPLICATION(NAME apTvSeMeanShift
                      APP  MeanShiftSegmentation
-                     OPTIONS --in ${INPUTDATA}/qb_RoadExtract2sub200x200.tif
-                 			 --fout ${TEMP}/apTvSeMeanShift_FilterOutput.tif
-                 			 --cout ${TEMP}/apTvSeMeanShift_ClusteredOutput.tif
-                 			 --lout ${TEMP}/apTvSeMeanShift_LabeledClusteredOutput.tif
-                 			 --cbout ${TEMP}/apTvSeMeanShift_ClusterBoundariesOutput.tif
-                 			 --spatialr 16
-                 			 --ranger 16
-                 			 --minsize 10
-                 			 --scale 1.0
+                     OPTIONS -in ${INPUTDATA}/qb_RoadExtract2sub200x200.tif
+                 			 -fout ${TEMP}/apTvSeMeanShift_FilterOutput.tif
+                 			 -cout ${TEMP}/apTvSeMeanShift_ClusteredOutput.tif
+                 			 -lout ${TEMP}/apTvSeMeanShift_LabeledClusteredOutput.tif
+                 			 -cbout ${TEMP}/apTvSeMeanShift_ClusterBoundariesOutput.tif
+                 			 -spatialr 16
+                 			 -ranger 16
+                 			 -minsize 10
+                 			 -scale 1.0
                      VALID   --compare-n-images ${EPSILON_7} 4
                                ${BASELINE}/bfMeanShiftVectorImageFilterOutput.tif
                     		   ${TEMP}/apTvSeMeanShift_FilterOutput.tif
@@ -25,23 +25,23 @@ OTB_TEST_APPLICATION(NAME apTvSeMeanShift
 
 OTB_TEST_APPLICATION(NAME  apTvCcConnectedComponentSegmentationMaskMuParserShp
                      APP  ConnectedComponentSegmentation
-                     OPTIONS --in ${INPUTDATA}/ROI_QB_MUL_4.tif
-                             --out ${TEMP}/apTvCcConnectedComponentSegmentationMaskMuParser.shp
-                             --mask "((b1>80)*intensity>95)"
-                             --expr "distance<10"
-                             --minsize 15
-                             --obia "SHAPE_Elongation>8"
+                     OPTIONS -in ${INPUTDATA}/ROI_QB_MUL_4.tif
+                             -out ${TEMP}/apTvCcConnectedComponentSegmentationMaskMuParser.shp
+                             -mask "((b1>80)*intensity>95)"
+                             -expr "distance<10"
+                             -minsize 15
+                             -obia "SHAPE_Elongation>8"
                      VALID   --compare-ogr ${NOTOL}
                              ${BASELINE_FILES}/apTvCcConnectedComponentSegmentationMaskMuParser.shp
                              ${TEMP}/apTvCcConnectedComponentSegmentationMaskMuParser.shp)
 
 OTB_TEST_APPLICATION(NAME  apTvCcConnectedComponentSegmentatioNoMask
                      APP  ConnectedComponentSegmentation
-                     OPTIONS --in ${INPUTDATA}/ROI_QB_MUL_4.tif
-                             --out ${TEMP}/apTvCcConnectedComponentSegmentationNoMask.shp
-                             --expr "distance<10"
-                             --minsize 15
-                             --obia "SHAPE_Elongation>8"
+                     OPTIONS -in ${INPUTDATA}/ROI_QB_MUL_4.tif
+                             -out ${TEMP}/apTvCcConnectedComponentSegmentationNoMask.shp
+                             -expr "distance<10"
+                             -minsize 15
+                             -obia "SHAPE_Elongation>8"
                      VALID   --compare-ogr ${NOTOL}
                              ${BASELINE_FILES}/apTvCcConnectedComponentSegmentationNoMask.shp
                              ${TEMP}/apTvCcConnectedComponentSegmentationNoMask.shp)                    		   
diff --git a/Testing/Applications/Utils/CMakeLists.txt b/Testing/Applications/Utils/CMakeLists.txt
index 9e151ab42d..a85d184358 100644
--- a/Testing/Applications/Utils/CMakeLists.txt
+++ b/Testing/Applications/Utils/CMakeLists.txt
@@ -7,10 +7,10 @@ set(TEST_DRIVER otbTestDriver
 
 OTB_TEST_APPLICATION(NAME  apTvUtRescaleTest
                      APP  Rescale
-                     OPTIONS --in ${INPUTDATA}/poupees.tif
-                             --out ${TEMP}/apTvUtRescaleTest.png uint8
-                             --outmin 20
-                             --outmax 150
+                     OPTIONS -in ${INPUTDATA}/poupees.tif
+                             -out ${TEMP}/apTvUtRescaleTest.png uint8
+                             -outmin 20
+                             -outmax 150
                      VALID   --compare-image ${NOTOL}
                              ${BASELINE}/apTvUtRescaleTest.png
                              ${TEMP}/apTvUtRescaleTest.png)
@@ -18,9 +18,9 @@ OTB_TEST_APPLICATION(NAME  apTvUtRescaleTest
 #--- Smoothing ---#
 OTB_TEST_APPLICATION(NAME  apTvUtSmoothingTest
                      APP  Smoothing
-                     OPTIONS --in ${INPUTDATA}/poupees.tif
-               	             --out ${TEMP}/apTvUtSmoothingTest.tif
-                             --type mean
+                     OPTIONS -in ${INPUTDATA}/poupees.tif
+               	             -out ${TEMP}/apTvUtSmoothingTest.tif
+                             -type mean
                      VALID   --compare-image ${NOTOL}
                              ${BASELINE}/apTvUtSmoothingTest.tif
                              ${TEMP}/apTvUtSmoothingTest.tif)
@@ -28,21 +28,21 @@ OTB_TEST_APPLICATION(NAME  apTvUtSmoothingTest
 
 OTB_TEST_APPLICATION(NAME  apTvUtReadImageInfoTest
                      APP  ReadImageInfo
-                     OPTIONS --in ${INPUTDATA}/poupees.tif)
+                     OPTIONS -in ${INPUTDATA}/poupees.tif)
 
 IF(OTB_DATA_USE_LARGEINPUT)
 
 OTB_TEST_APPLICATION(NAME  apTvUtReadImageInfoSpot5
                      APP  ReadImageInfo
-                     OPTIONS --in ${LARGEDATA}/SPOT5/TEHERAN/IMAGERY.TIF)
+                     OPTIONS -in ${LARGEDATA}/SPOT5/TEHERAN/IMAGERY.TIF)
                      
 OTB_TEST_APPLICATION(NAME  apTvUtReadImageInfoERS
                      APP  ReadImageInfo
-                     OPTIONS --in ${LARGEDATA}/SAR_ERS2_SLCI_SCENE1/DAT_01.001)
+                     OPTIONS -in ${LARGEDATA}/SAR_ERS2_SLCI_SCENE1/DAT_01.001)
 
 OTB_TEST_APPLICATION(NAME  apTvUtReadImageInfoRADARSAT1
                      APP  ReadImageInfo
-                     OPTIONS --in ${LARGEDATA}/RADARSAT1/GOMA/SCENE01/DAT_01.001)
+                     OPTIONS -in ${LARGEDATA}/RADARSAT1/GOMA/SCENE01/DAT_01.001)
 
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
@@ -50,26 +50,26 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 OTB_TEST_APPLICATION(NAME apTvUtExtractROIRightInputFile
                      APP  ExtractROI
-                     OPTIONS --in ${INPUTDATA}/couleurs_extrait.png
-                             --out ${TEMP}/apTvUtExtractROIRightInputFile.tif
+                     OPTIONS -in ${INPUTDATA}/couleurs_extrait.png
+                             -out ${TEMP}/apTvUtExtractROIRightInputFile.tif
                      VALID   --compare-image ${NOTOL}
                              ${INPUTDATA}/couleurs_extrait.png
                              ${TEMP}/apTvUtExtractROIRightInputFile.tif)
 
 OTB_TEST_APPLICATION(NAME apTvUtExtractROISizeNULL
                      APP  ExtractROI
-                     OPTIONS --in ${INPUTDATA}/couleurs_extrait.png
-                 			 --out ${TEMP}/apTvUtExtractROISizeNULL.tif
-                 			 --sizex 0
+                     OPTIONS -in ${INPUTDATA}/couleurs_extrait.png
+                 			 -out ${TEMP}/apTvUtExtractROISizeNULL.tif
+                 			 -sizex 0
                      VALID   --compare-image ${NOTOL}
                              ${INPUTDATA}/couleurs_extrait.png
                              ${TEMP}/apTvUtExtractROISizeNULL.tif)
                              
 OTB_TEST_APPLICATION(NAME apTvUtExtractROISizeTooBig
                      APP  ExtractROI
-                     OPTIONS --in ${INPUTDATA}/couleurs_extrait.png
-                 			 --out ${TEMP}/apTvUtExtractROISizeTooBig.tif
-                 			 --sizex 1000000 
+                     OPTIONS -in ${INPUTDATA}/couleurs_extrait.png
+                 			 -out ${TEMP}/apTvUtExtractROISizeTooBig.tif
+                 			 -sizex 1000000 
                      VALID   --compare-image ${NOTOL}
                              ${INPUTDATA}/couleurs_extrait.png
                              ${TEMP}/apTvUtExtractROISizeTooBig.tif)
@@ -78,18 +78,18 @@ OTB_TEST_APPLICATION(NAME apTvUtExtractROISizeTooBig
 #--- ConcatenateImages ---#
 OTB_TEST_APPLICATION(NAME apTvUtConcatenateImages_1Image
                      APP  ConcatenateImages
-                     OPTIONS --il ${INPUTDATA}/poupees_c1
-                             --out ${TEMP}/apTvUtConcatenateImages_1Image.tif
+                     OPTIONS -il ${INPUTDATA}/poupees_c1
+                             -out ${TEMP}/apTvUtConcatenateImages_1Image.tif
                      VALID   --compare-image ${NOTOL}
                              ${INPUTDATA}/poupees_c1
                              ${TEMP}/apTvUtConcatenateImages_1Image.tif)
 
 OTB_TEST_APPLICATION(NAME apTvUtConcatenateImages
                      APP  ConcatenateImages
-                     OPTIONS --il ${INPUTDATA}/poupees_sub_c1.png 
+                     OPTIONS -il ${INPUTDATA}/poupees_sub_c1.png 
                                   ${INPUTDATA}/poupees_sub_c2.png 
                                   ${INPUTDATA}/poupees_sub_c3.png
-                 			 --out ${TEMP}/apTvUtConcatenateImages.png
+                 			 -out ${TEMP}/apTvUtConcatenateImages.png
                      VALID   --compare-image ${NOTOL}
                              ${INPUTDATA}/poupees_sub_3c.png
                              ${TEMP}/apTvUtConcatenateImages.png)
@@ -98,11 +98,11 @@ OTB_TEST_APPLICATION(NAME apTvUtConcatenateImages
 
 OTB_TEST_APPLICATION(NAME apTvUtBandMath
                      APP  BandMath
-                     OPTIONS --il ${INPUTDATA}/poupees_sub_c1.png 
+                     OPTIONS -il ${INPUTDATA}/poupees_sub_c1.png 
                                   ${INPUTDATA}/poupees_sub_c2.png 
                                   ${INPUTDATA}/poupees_sub.png
-                             --out ${TEMP}/apTvUtBandMathOutput.tif
-                             --exp "cos(im1b1)+im2b1*im3b1-im3b2+ndvi(im3b3,im3b4)"
+                             -out ${TEMP}/apTvUtBandMathOutput.tif
+                             -exp "cos(im1b1)+im2b1*im3b1-im3b2+ndvi(im3b3,im3b4)"
                      VALID   --compare-image ${NOTOL}
                              ${INPUTDATA}/apTvUtBandMathOutput.tif
                              ${TEMP}/apTvUtBandMathOutput.tif)
@@ -112,8 +112,8 @@ OTB_TEST_APPLICATION(NAME apTvUtBandMath
 
 OTB_TEST_APPLICATION(NAME apTvUtSplitImage
                      APP SplitImage
-                     OPTIONS --in  ${INPUTDATA}/poupees_sub.png
-                             --out ${TEMP}/apTvUtSplitImageOutput.tif
+                     OPTIONS -in  ${INPUTDATA}/poupees_sub.png
+                             -out ${TEMP}/apTvUtSplitImageOutput.tif
                      VALID   --compare-n-images ${NOTOL} 3
                              ${INPUTDATA}/poupees_sub_c1.png
                              ${TEMP}/apTvUtSplitImageOutput_0.tif
@@ -127,8 +127,8 @@ OTB_TEST_APPLICATION(NAME apTvUtSplitImage
 #--- Convert ----
 OTB_TEST_APPLICATION(NAME apTvUtConvertBasic
                      APP Convert
-                     OPTIONS --in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
-                             --out ${TEMP}/apTvUtConvertBasicOutput.tif
+                     OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
+                             -out ${TEMP}/apTvUtConvertBasicOutput.tif
                      VALID   --compare-image ${NOTOL}
                              ${INPUTDATA}/apTvUtConvertBasicOutput.tif
                 	     ${TEMP}/apTvUtConvertBasicOutput.tif
@@ -136,9 +136,9 @@ OTB_TEST_APPLICATION(NAME apTvUtConvertBasic
 
 OTB_TEST_APPLICATION(NAME apTvUtConvertWithScaling
                      APP Convert
-                     OPTIONS --in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
-                             --out ${TEMP}/apTvUtConvertWithScalingOutput.tif
-                             --type linear
+                     OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
+                             -out ${TEMP}/apTvUtConvertWithScalingOutput.tif
+                             -type linear
                      VALID   --compare-image ${NOTOL}
                              ${INPUTDATA}/apTvUtConvertWithScalingOutput.tif
                 	     ${TEMP}/apTvUtConvertWithScalingOutput.tif
@@ -147,20 +147,20 @@ OTB_TEST_APPLICATION(NAME apTvUtConvertWithScaling
 #--- KmzExport ----
 OTB_TEST_APPLICATION(NAME apTvUtKmzExport
                      APP KmzExport
-                     OPTIONS --in   ${INPUTDATA}/qb_RoadExtract.img
-                             --out ${TEMP}/apTvUtKmzExport.kmz
-                             --logo ${INPUTDATA}/cnes.png
-                             --legend ${INPUTDATA}/otb_big.png
-                             --dem ${INPUTDATA}/DEM/srtm_directory)
+                     OPTIONS -in   ${INPUTDATA}/qb_RoadExtract.img
+                             -out ${TEMP}/apTvUtKmzExport.kmz
+                             -logo ${INPUTDATA}/cnes.png
+                             -legend ${INPUTDATA}/otb_big.png
+                             -dem ${INPUTDATA}/DEM/srtm_directory)
 
 
 IF(OTB_DATA_USE_LARGEINPUT)
 #--- OSMDownloader ---
 OTB_TEST_APPLICATION(NAME apTvUtOSMDownloader
                      APP OSMDownloader
-                     OPTIONS --support ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/ROI_QB_TOULOUSE.TIF
-                             --key highway
-                             --out ${TEMP}/apTvUtOSMDownloader.shp
+                     OPTIONS -support ${OTB_DATA_LARGEINPUT_ROOT}/DEMPSTER-SHAFER/ROI_QB_TOULOUSE.TIF
+                             -key highway
+                             -out ${TEMP}/apTvUtOSMDownloader.shp
                      VALID   --compare-ogr ${NOTOL}  
                              ${OTBAPP_BASELINE_FILES}/otbOSMDownloaderOutput.shp
                              ${TEMP}/apTvUtOSMDownloader.shp)
@@ -168,22 +168,22 @@ OTB_TEST_APPLICATION(NAME apTvUtOSMDownloader
 #--- VectorDataTransform ---
 OTB_TEST_APPLICATION(NAME apTvUtVectorDataTransform_Rotation
                      APP VectorDataTransform
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
-                             --vd ${INPUTDATA}/ToulouseRoad-examples.shp
-                             --out ${TEMP}/apTvUtVectorDataTransform_rotation.shp
-                             --transform.ro 15
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
+                             -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)
 
 OTB_TEST_APPLICATION(NAME apTvUtVectorDataTransform_Translation_Rotation
                      APP VectorDataTransform
-                     OPTIONS --in ${OTB_DATA_LARGEINPUT_ROOT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
-                             --vd ${INPUTDATA}/ToulouseRoad-examples.shp
-                             --out ${TEMP}/apTvUtVectorDataTransform_Translation_rotation.shp
-                             --transform.ro 15
-                             --transform.tx  5
-                             --transform.ty  6
+                     OPTIONS -in ${OTB_DATA_LARGEINPUT_ROOT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
+                             -vd ${INPUTDATA}/ToulouseRoad-examples.shp
+                             -out ${TEMP}/apTvUtVectorDataTransform_Translation_rotation.shp
+                             -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)
@@ -191,9 +191,9 @@ OTB_TEST_APPLICATION(NAME apTvUtVectorDataTransform_Translation_Rotation
 #--- VectorDataExtractROIApplication ---
 OTB_TEST_APPLICATION(NAME apTvUtVectorDataExtractROIApplication
                      APP VectorDataExtractROIApplication
-                     OPTIONS --io.in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
-                             --io.vd ${OTB_DATA_LARGEINPUT_ROOT}/VECTOR/MidiPyrenees/roads.shp
-                             --io.out ${TEMP}/apTvUtVectorDataExtractROIApplicationTest.shp
+                     OPTIONS -io.in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
+                             -io.vd ${OTB_DATA_LARGEINPUT_ROOT}/VECTOR/MidiPyrenees/roads.shp
+                             -io.out ${TEMP}/apTvUtVectorDataExtractROIApplicationTest.shp
                      VALID   --compare-ogr ${NOTOL}
                              ${BASELINE_FILES}/apTvUtVectorDataExtractROIApplicationTest.shp
                              ${TEMP}/apTvUtVectorDataExtractROIApplicationTest.shp
@@ -204,9 +204,9 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 #--- Concatenate VectorData ---
 OTB_TEST_APPLICATION(NAME apTvUtConcatenateVectorData
                      APP ConcatenateVectorData
-                     OPTIONS --vd   ${INPUTDATA}/waterways.shp
+                     OPTIONS -vd   ${INPUTDATA}/waterways.shp
                                     ${INPUTDATA}/france_coastline.shp
-                             --out ${TEMP}/apTvUtConcatenateVectorDataOutputTest.shp
+                             -out ${TEMP}/apTvUtConcatenateVectorDataOutputTest.shp
                      VALID   --compare-ogr ${NOTOL}
                              ${OTBAPP_BASELINE_FILES}/utTvConcatenateVectorData.shp
                              ${TEMP}/apTvUtConcatenateVectorDataOutputTest.shp)
@@ -214,14 +214,14 @@ OTB_TEST_APPLICATION(NAME apTvUtConcatenateVectorData
 #--- CompareImages ---
 OTB_TEST_APPLICATION(NAME apTvUtCompareImages
                      APP CompareImages
-                     OPTIONS --ref.in ${INPUTDATA}/poupees.tif
-                             --ref.channel 2
-                             --meas.in ${INPUTDATA}/brain.png
-                             --meas.channel 1
-                             --roi.startx 20
-                             --roi.starty 15
-                             --roi.sizex 150
-                             --roi.sizey 200
+                     OPTIONS -ref.in ${INPUTDATA}/poupees.tif
+                             -ref.channel 2
+                             -meas.in ${INPUTDATA}/brain.png
+                             -meas.channel 1
+                             -roi.startx 20
+                             -roi.starty 15
+                             -roi.sizex 150
+                             -roi.sizey 200
                              TESTENVOPTIONS ${TEMP}/apTvUtCompareImages.txt
                      VALID   --compare-ascii ${EPSILON_7}
                              ${BASELINE_FILES}/apTvUtCompareImages.txt
@@ -230,10 +230,10 @@ OTB_TEST_APPLICATION(NAME apTvUtCompareImages
 #--- VectorDataSetField ---
 OTB_TEST_APPLICATION(NAME apTvUtVectorDataSetField
                      APP VectorDataSetField
-                     OPTIONS --in ${INPUTDATA}/ToulousePoints-examples.shp
-                             --out ${TEMP}/apTvUtVectorDataSetFieldTest.shp
-                             --fn MyField
-                             --fv MyValue
+                     OPTIONS -in ${INPUTDATA}/ToulousePoints-examples.shp
+                             -out ${TEMP}/apTvUtVectorDataSetFieldTest.shp
+                             -fn MyField
+                             -fv MyValue
                      VALID   --compare-ogr ${NOTOL}
                              ${BASELINE_FILES}/apTvUtVectorDataSetFieldTest.shp
                              ${TEMP}/apTvUtVectorDataSetFieldTest.shp
@@ -242,9 +242,9 @@ OTB_TEST_APPLICATION(NAME apTvUtVectorDataSetField
 #--- Quicklook ---
 OTB_TEST_APPLICATION(NAME apTvUtQuicklookROI1Channel
                      APP Quicklook
-                     OPTIONS --in ${INPUTDATA}/couleurs_extrait.png
-                             --out ${TEMP}/apTvUtQuicklookROI1Channel.tif
-                             --cl Channel1
+                     OPTIONS -in ${INPUTDATA}/couleurs_extrait.png
+                             -out ${TEMP}/apTvUtQuicklookROI1Channel.tif
+                             -cl Channel1
                      VALID   --compare-image ${NOTOL}
                              ${BASELINE}/apTvUtQuicklookROI1Channel.tif
                              ${TEMP}/apTvUtQuicklookROI1Channel.tif
@@ -253,14 +253,14 @@ OTB_TEST_APPLICATION(NAME apTvUtQuicklookROI1Channel
 IF(OTB_DATA_USE_LARGEINPUT)
 OTB_TEST_APPLICATION(NAME apTvUtQuicklookSpot5
                      APP Quicklook
-                     OPTIONS --in ${LARGEDATA}/SPOT5/TEHERAN/IMAGERY.TIF
-                             --out ${TEMP}/apTvUtQuicklookSpot5.tif
-                             --cl Channel1 Channel2 Channel3
-                             --rox 10
-                             --roy 10
-                             --rsx 100
-                             --rsy 200
-                             --sr 2
+                     OPTIONS -in ${LARGEDATA}/SPOT5/TEHERAN/IMAGERY.TIF
+                             -out ${TEMP}/apTvUtQuicklookSpot5.tif
+                             -cl Channel1 Channel2 Channel3
+                             -rox 10
+                             -roy 10
+                             -rsx 100
+                             -rsy 200
+                             -sr 2
                      VALID   --compare-image ${NOTOL}
                              ${BASELINE}/apTvUtQuicklookSpot5.png
                              ${TEMP}/apTvUtQuicklookSpot5.tif
-- 
GitLab