Skip to content
Snippets Groups Projects
Commit ed8ff709 authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

BUG: separate test using tinyXML from the rest

parent cbc4e017
No related branches found
No related tags found
No related merge requests found
...@@ -40,6 +40,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT) ...@@ -40,6 +40,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
SET(TEMP ${OTB_BINARY_DIR}/Testing/Temporary) SET(TEMP ${OTB_BINARY_DIR}/Testing/Temporary)
SET(EXE_TESTS ${CXX_TEST_PATH}/otbProjectionsExamplesTests) SET(EXE_TESTS ${CXX_TEST_PATH}/otbProjectionsExamplesTests)
SET(EXE_TESTS2 ${CXX_TEST_PATH}/otbProjectionsExamplesTests2)
SET(TOL 0.0) SET(TOL 0.0)
...@@ -102,18 +103,21 @@ ADD_TEST(VectorDataProjectionExampleTest ${EXE_TESTS} ...@@ -102,18 +103,21 @@ ADD_TEST(VectorDataProjectionExampleTest ${EXE_TESTS}
ENDIF(OTB_DATA_USE_LARGEINPUT) ENDIF(OTB_DATA_USE_LARGEINPUT)
IF( OTB_USE_CURL ) IF( OTB_USE_CURL )
ADD_TEST(PlaceNameToLonLatExampleTest ${EXE_TESTS} ADD_TEST(PlaceNameToLonLatExampleTest ${EXE_TESTS2}
PlaceNameToLonLatExampleTest PlaceNameToLonLatExampleTest
Toulouse Toulouse
) )
ENDIF( OTB_USE_CURL ) ENDIF( OTB_USE_CURL )
ADD_EXECUTABLE(otbProjectionsExamplesTests otbProjectionsExamplesTests.cxx)
TARGET_LINK_LIBRARIES(otbProjectionsExamplesTests OTBCommon OTBIO OTBProjections)
IF( OTB_USE_CURL ) IF( OTB_USE_CURL )
ADD_EXECUTABLE(otbProjectionsExamplesTests otbProjectionsExamplesTests.cxx) ADD_EXECUTABLE(otbProjectionsExamplesTests2 otbProjectionsExamplesTests2.cxx)
TARGET_LINK_LIBRARIES(otbProjectionsExamplesTests OTBCommon OTBIO OTBProjections ${CURL_LIBRARY} tinyXML) TARGET_LINK_LIBRARIES(otbProjectionsExamplesTests2 OTBCommon OTBIO OTBProjections ${CURL_LIBRARY} tinyXML)
ELSE( OTB_USE_CURL )
ADD_EXECUTABLE(otbProjectionsExamplesTests otbProjectionsExamplesTests.cxx)
TARGET_LINK_LIBRARIES(otbProjectionsExamplesTests OTBCommon OTBIO OTBProjections)
ENDIF( OTB_USE_CURL ) ENDIF( OTB_USE_CURL )
ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
...@@ -29,7 +29,6 @@ void RegisterTests() ...@@ -29,7 +29,6 @@ void RegisterTests()
REGISTER_TEST(OrthoRectificationExampleTest); REGISTER_TEST(OrthoRectificationExampleTest);
REGISTER_TEST(MapProjectionExampleTest); REGISTER_TEST(MapProjectionExampleTest);
REGISTER_TEST(VectorDataProjectionExampleTest); REGISTER_TEST(VectorDataProjectionExampleTest);
REGISTER_TEST(PlaceNameToLonLatExampleTest);
} }
#undef main #undef main
...@@ -44,6 +43,4 @@ void RegisterTests() ...@@ -44,6 +43,4 @@ void RegisterTests()
#define main VectorDataProjectionExampleTest #define main VectorDataProjectionExampleTest
#include "VectorDataProjectionExample.cxx" #include "VectorDataProjectionExample.cxx"
#undef main
#define main PlaceNameToLonLatExampleTest
#include "PlaceNameToLonLatExample.cxx"
/*=========================================================================
Program: ORFEO Toolbox
Language: C++
Date: $Date$
Version: $Revision$
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
// this file defines the otbMultiScaleTest for the test driver
// and all it expects is that you have a function called RegisterTests
#if defined(_MSC_VER)
#pragma warning ( disable : 4786 )
#endif
#include <iostream>
#include "otbTestMain.h"
void RegisterTests()
{
REGISTER_TEST(PlaceNameToLonLatExampleTest);
}
#undef main
#define main PlaceNameToLonLatExampleTest
#include "PlaceNameToLonLatExample.cxx"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment