Merge branch '1834-test-data-switch' into '1834-test-data-lfs'

Fix issue on reduced OTB-data

See merge request !396

CMake/OTBStandaloneModuleMacros.cmake

@@ -251,7 +251,7 @@ macro(otb_module_impl)
 
   find_path(OTB_DATA_ROOT
   NAMES README-OTB-Data
-  HINTS $ENV{OTB_DATA_ROOT} ${CMAKE_CURRENT_SOURCE_DIR}/../OTB-Data)
+  HINTS $ENV{OTB_DATA_ROOT} ${CMAKE_CURRENT_SOURCE_DIR}/../OTB/Data)
   mark_as_advanced(OTB_DATA_ROOT)
 
   set(BASELINE       ${OTB_DATA_ROOT}/Baseline/OTB/Images)
@@ -260,11 +260,11 @@ macro(otb_module_impl)
   set(TEMP           ${CMAKE_BINARY_DIR}/Testing/Temporary)
   set(OTBAPP_BASELINE       ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Images)
   set(OTBAPP_BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Files)
-  
+
   if(BUILD_TESTING)
     enable_testing()
   endif()
-  
+
   include(otb-module.cmake) # Load module meta-data
   set(${otb-module}_INSTALL_RUNTIME_DIR ${CMAKE_INSTALL_PREFIX}/bin)
   set(${otb-module}_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_PREFIX}/lib)
@@ -273,7 +273,7 @@ macro(otb_module_impl)
 
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-  
+
   # Collect all sources and headers for IDE projects.
   set(_srcs "")
   if("${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio|KDevelop"
@@ -361,7 +361,7 @@ macro(otb_module_impl)
   endif()
 
   if(EXISTS ${${otb-module}_SOURCE_DIR}/app/CMakeLists.txt AND NOT ${otb-module}_NO_SRC)
-    add_subdirectory(app) 
+    add_subdirectory(app)
   endif()
 
   if(BUILD_TESTING AND EXISTS ${${otb-module}_SOURCE_DIR}/test/CMakeLists.txt)
@@ -418,4 +418,3 @@ macro(otb_module_impl)
   set(otb-module-INCLUDE_DIRS "${otb-module-INCLUDE_DIRS-build}")
   set(otb-module-EXPORT_CODE "${otb-module-EXPORT_CODE-build}")
 endmacro()
-

CMakeLists.txt

@@ -104,8 +104,8 @@ repository_status(${PROJECT_SOURCE_DIR} OTB_GIT_STATUS_MESSAGE)
 # Configure the default OTB_DATA_ROOT for the location of OTB Data.
 find_path(OTB_DATA_ROOT
   NAMES README-OTB-Data
-  HINTS $ENV{OTB_DATA_ROOT} ${OTB_SOURCE_DIR}/../OTB-Data
-)
+  HINTS $ENV{OTB_DATA_ROOT} ${OTB_SOURCE_DIR}/Data
+  )
 #mark_as_advanced(OTB_DATA_ROOT)
 
 if(OTB_DATA_ROOT)

Data/README-OTB-Data

+
+These data are used to run the OTB test suite and to reproduce the examples illustrating the software guide.
+
+(this file is also used for the automatic location of OTB-Data by cmake)
+

Modules/Core/PointSet/test/CMakeLists.txt

@@ -87,4 +87,3 @@ otb_add_test(NAME feTvThresholdImageToPointSet4 COMMAND otbPointSetTestDriver
   ${INPUTDATA}/small_points.raw.hdr
   ${TEMP}/feThresholdImageToPointSet_Threshold_1To200.txt
   1 200 )
-

Modules/Feature/Corner/test/CMakeLists.txt

@@ -115,4 +115,3 @@ otb_add_test(NAME feTvHarrisToPointSet1 COMMAND otbCornerTestDriver
   ${INPUTDATA}/small_points.raw.hdr
   ${TEMP}/feHarrisToPointSet_Threshold_2To255.txt
   1.0 1.0 1.0 2.0 255.0)
-

Modules/Feature/Descriptors/test/CMakeLists.txt

@@ -54,7 +54,7 @@ otb_add_test(NAME feTvForwardFourierMellinImageFilter COMMAND otbDescriptorsTest
   ${BASELINE}/feForwardFourierMellinImageFilterImag.tif
   ${TEMP}/feForwardFourierMellinImageFilterImag.tif
   otbFourierMellinImageFilter
-  ${INPUTDATA}/circle.hdr
+  ${INPUTDATA}/circle.raw.hdr
   ${TEMP}/feForwardFourierMellinImageFilterReal.tif
   ${TEMP}/feForwardFourierMellinImageFilterImag.tif)
 

Modules/Filtering/Path/test/CMakeLists.txt

@@ -207,4 +207,3 @@ otb_add_test(NAME coTvPolyLineImageIterator COMMAND otbPathTestDriver
   512 512 20
   ${TEMP}/coTvPolyLineImageIterator.png
   )
-

Modules/Filtering/Statistics/test/CMakeLists.txt

@@ -235,7 +235,7 @@ otb_add_test(NAME bfTvStreamingStatisticsImageFilter COMMAND otbStatisticsTestDr
   otbStreamingStatisticsImageFilter
   ${INPUTDATA}/small_poupees_1canal.hd
   ${TEMP}/bfStreamingStatisticsImageFilterResults.txt)
-  
+
 foreach(inputFileType "UINT8" "UINT16" "INT16" "UINT32" "INT32" "FLOAT" "DOUBLE")
   foreach(sizeType "LARGE" "SMALL")
     string(TOLOWER ${sizeType} lsizeType)

Modules/IO/IOBSQ/test/CMakeLists.txt

@@ -37,4 +37,3 @@ otb_add_test(NAME ioTuBSQImageIOCanRead COMMAND otbIOBSQTestDriver otbBSQImageIO
 
 otb_add_test(NAME ioTuBSQImageIOCanWrite COMMAND otbIOBSQTestDriver otbBSQImageIOTestCanWrite
   ${TEMP}/poupees.hd)
-

Modules/IO/ImageIO/test/CMakeLists.txt

@@ -195,10 +195,10 @@ otb_add_test(NAME ioTvImageReaderWriterRgbPNG2PNGBox COMMAND otbImageIOTestDrive
   )
 
 otb_add_test(NAME ioTvImageReaderWriterRgbENVI2PNG COMMAND otbImageIOTestDriver
-  --compare-image ${EPSILON_9}   ${INPUTDATA}/poupees
+  --compare-image ${EPSILON_9}   ${INPUTDATA}/poupees.raw
   ${TEMP}/ioImageReaderWriterRgbENVI2PNG_poupees.png
   otbImageFileReaderRGBTest
-  ${INPUTDATA}/poupees
+  ${INPUTDATA}/poupees.raw
   ${TEMP}/ioImageReaderWriterRgbENVI2PNG_poupees.png )
 
 otb_add_test(NAME ioTvImageFileReaderRGB_Cai_SPOT5TIF2PNG COMMAND otbImageIOTestDriver

Modules/Registration/Stereo/test/CMakeLists.txt

@@ -259,9 +259,9 @@ otb_add_test(NAME dmTvAdhesionCorrectionFilter COMMAND otbStereoTestDriver
   ${BASELINE}/dmTuAdhesionCorrectionMethod_RiskEdges.tif
   ${TEMP}/dmTuAdhesionCorrectionMethod_RiskEdges.tif
   otbAdhesionCorrectionFilter
-  ${INPUTDATA}/AdhesionCorrectionFilter_MedianInput
+  ${INPUTDATA}/AdhesionCorrectionFilter_MedianInput.raw
   ${INPUTDATA}/AdhesionCorrectionFilter_MedianMaskInput.png
-  ${INPUTDATA}/AdhesionCorrectionFilter_SubpixelDisparityInput
+  ${INPUTDATA}/AdhesionCorrectionFilter_SubpixelDisparityInput.raw
   ${INPUTDATA}/AdhesionCorrectionFilter_SubpixelMaskInput.png
   ${INPUTDATA}/AdhesionCorrectionFilter_CannyRefInput.raw
   ${INPUTDATA}/AdhesionCorrectionFilter_CannyMedianInput.raw

Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt

@@ -87,7 +87,7 @@ otb_add_test(NAME owTvParameterKey COMMAND otbApplicationEngineTestDriver
 
 otb_add_test(NAME owTvInputImageListParameter COMMAND otbApplicationEngineTestDriver
   otbWrapperInputImageListParameterTest1
-  ${INPUTDATA}/poupees_c1.hdr
+  ${INPUTDATA}/poupees_c1.raw.hdr
   ${INPUTDATA}/poupees.tif
   "mykey"
   "my description"