diff --git a/Testing/Code/Common/otbConfigurationTest.cxx b/Testing/Code/Common/otbConfigurationTest.cxx index 7931da967c9cc8587e0ae9f9f3d85844a88bc559..1009b21cefe7d75e271b4c0a7f91df5a4713f3e5 100644 --- a/Testing/Code/Common/otbConfigurationTest.cxx +++ b/Testing/Code/Common/otbConfigurationTest.cxx @@ -33,7 +33,7 @@ int otbConfigurationTest(int argc, char * argv[]) std::cout << conf << std::endl; - if (lang != "fr_FR.UTF-8" || lang != "en_EN.UTF-8") + if( lang.compare("fr_FR.UTF-8") != 0 && lang.compare("en_EN.UTF-8") !=0 ) { std::cout << "Locale language " << lang << std::endl; return EXIT_FAILURE; diff --git a/Testing/Code/Projections/otbSensorModel.cxx b/Testing/Code/Projections/otbSensorModel.cxx index 91526c615d8eaa9ddd3d20da2eff39e220238e46..c26ebb198aeab673e58379753431c5fa632ee7ed 100644 --- a/Testing/Code/Projections/otbSensorModel.cxx +++ b/Testing/Code/Projections/otbSensorModel.cxx @@ -42,7 +42,7 @@ int otbSensorModel( int argc, char* argv[] ) std::ofstream file; file.open(outFilename); - file << std::setprecision(15); + file << std::setprecision(20); typedef otb::VectorImage<double, 2> ImageType; diff --git a/Testing/Utilities/CMakeLists.txt b/Testing/Utilities/CMakeLists.txt index db6615dafa1485ab5710530cbe71f14d5690cc73..60af30f912a38437d2db62ea9e899db014d4c359 100644 --- a/Testing/Utilities/CMakeLists.txt +++ b/Testing/Utilities/CMakeLists.txt @@ -30,16 +30,18 @@ SET(UTILITIES_TESTS ${CXX_TEST_PATH}/otbUtilitiesTests) IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(utTvOssimKeywordlistToulouseQuickBirdTest ${UTILITIES_TESTS} ---compare-list ${EPSILON_6} ${BASELINE_FILES}/utOssimKeywordlistToulouseQuickBird.txt - ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt +--ignore-order --compare-ascii ${EPSILON_6} + ${BASELINE_FILES}/utOssimKeywordlistToulouseQuickBird.txt + ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt ossimKeywordlistTest ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt ) ADD_TEST(utTvOssimKeywordlistBlossevilleIkonosTest ${UTILITIES_TESTS} ---compare-list ${NOTOL} ${BASELINE_FILES}/utOssimKeywordlistBlossevilleIkonos.txt - ${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt +--ignore-order --compare-ascii ${NOTOL} + ${BASELINE_FILES}/utOssimKeywordlistBlossevilleIkonos.txt + ${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt ossimKeywordlistTest ${IMAGEDATA}/IKONOS/BLOSSEVILLE/po_2619900_grn_0000000.tif ${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt