Commit b5e15a11 authored by Guillaume Pasero's avatar Guillaume Pasero

BUG: Mantis-1418: fix 2 other InXML tests with hardcoded paths

parent e40f6b78
......@@ -649,35 +649,13 @@ if(OTB_USE_LIBSVM)
otb_test_application(NAME apTvClTrainSVMImagesClassifierQB1_allOpt_InXML
APP TrainImagesClassifier
OPTIONS
-inxml ${INPUTDATA}/clsvmModelQB1_OutXML.xml
-io.il ${INPUTDATA}/Classification/QB_1_ortho.tif
-io.vd ${INPUTDATA}/Classification/VectorData_QB1.shp
-io.imstat ${INPUTDATA}/Classification/clImageStatisticsQB1.xml
-sample.mv 100
-sample.mt 100
-sample.vtr 0.5
-sample.vfn Class
-classifier.libsvm.opt true
-rand 121212
-inxml ${TEMP}/clsvmModelQB1_allOpt.xml
-io.out ${TEMP}/clsvmModelQB1_allOpt_InXML.svm
VALID ${ascii_comparison}
${OTBAPP_BASELINE_FILES}/clsvmModelQB1.svm
${TEMP}/clsvmModelQB1_allOpt_InXML.svm)
otb_test_application(NAME apTvClTrainSVMImagesClassifierQB1_OutXML
APP TrainImagesClassifier
OPTIONS -io.il ${INPUTDATA}/Classification/QB_1_ortho.tif
-io.vd ${INPUTDATA}/Classification/VectorData_QB1.shp
-io.imstat ${INPUTDATA}/Classification/clImageStatisticsQB1.xml
-sample.vfn Class
-classifier libsvm
-classifier.libsvm.opt true
-io.out ${TEMP}/clsvmModelQB1_OutXML.svm
-rand 121212
-outxml ${TEMP}/clsvmModelQB1_OutXML.xml
VALID ${ascii_comparison}
${OTBAPP_BASELINE_FILES}/clsvmModelQB1.svm
${TEMP}/clsvmModelQB1_OutXML.svm)
set_tests_properties(apTvClTrainSVMImagesClassifierQB1_allOpt_InXML PROPERTIES DEPENDS apTvClTrainSVMImagesClassifierQB1_allOpt)
otb_test_application(NAME apTvClTrainSVMImagesClassifierQB123
APP TrainImagesClassifier
......@@ -745,6 +723,7 @@ if(OTB_USE_LIBSVM)
-classifier.libsvm.opt true
-rand 121212
-io.out ${TEMP}/clsvmModelQB1_allOpt.svm
-outxml ${TEMP}/clsvmModelQB1_allOpt.xml
VALID ${ascii_comparison}
${OTBAPP_BASELINE_FILES}/clsvmModelQB1.svm
${TEMP}/clsvmModelQB1_allOpt.svm)
......
......@@ -102,13 +102,12 @@ add_test( NAME pyTvBandMathInXML
COMMAND ${TEST_DRIVER} Execute
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/PythonTestDriver.py
PythonInXMLTest
${INPUTDATA}/pyTvBandMathInXML.xml
${OTB_DATA_ROOT}/Input/verySmallFSATSW_r.tif
${OTB_DATA_ROOT}/Input/verySmallFSATSW_nir.tif
${OTB_DATA_ROOT}/Input/verySmallFSATSW.tif
${TEMP}/pyTvBandMathOutXML.xml
${TEMP}/pyTvBandMathInXML.tif
)
set_tests_properties(pyTvBandMathInXML PROPERTIES DEPENDS pyTvBandMathOutXML)
add_test( NAME pyTvNumpyIO
COMMAND ${TEST_DRIVER} Execute
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/PythonTestDriver.py
......
......@@ -31,8 +31,5 @@ def test(otb, argv):
app.SetParameterString("inxml", argv[1])
app.UpdateParameters()
imagelist = argv[2:-1]
app.SetParameterStringList("il", imagelist, True)
app.SetParameterString("out" , argv[-1])
app.ExecuteAndWriteOutput()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment