change how tests are added in the build system

- use a opm-macro to reduce code duplication
- add a 'test-suite' target which builds tests. for use if BUILD_TESTING
  is 0.
- add a 'check' target which builds tests, then executes them
This commit is contained in:
Arne Morten Kvarving
2015-05-26 13:07:44 +02:00
parent eb114ab03c
commit 9e96127705
14 changed files with 76 additions and 389 deletions
+1 -3
View File
@@ -14,6 +14,4 @@ foreach ( header ${json_headers} )
install( FILES ${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/opm/json RENAME ${header})
endforeach()
if (BUILD_TESTING)
add_subdirectory( tests )
endif()
add_subdirectory( tests )
+2 -4
View File
@@ -1,5 +1,3 @@
add_executable( runjsonTests jsonTests.cpp )
target_link_libraries( runjsonTests opm-json ${Boost_LIBRARIES})
opm_add_test(runjsonTests SOURCES jsonTests.cpp
LIBRARIES opm-json ${Boost_LIBRARIES})
set_source_files_properties( jsonTests.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-variable")
add_test( NAME runjsonTests WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runjsonTests )
+6 -33
View File
@@ -1,33 +1,6 @@
add_executable(runDeckRecordTests DeckRecordTests.cpp)
target_link_libraries(runDeckRecordTests Parser ${Boost_LIBRARIES})
add_test(NAME runDeckRecordTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckRecordTests )
add_executable(runDeckIntItemTests DeckIntItemTests.cpp)
target_link_libraries(runDeckIntItemTests Parser ${Boost_LIBRARIES})
add_test(NAME runDeckIntItemTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckIntItemTests )
add_executable(runDeckDoubleItemTests DeckDoubleItemTests.cpp)
target_link_libraries(runDeckDoubleItemTests Parser ${Boost_LIBRARIES})
add_test(NAME runDeckDoubleItemTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckDoubleItemTests )
add_executable(runDeckFloatItemTests DeckFloatItemTests.cpp)
target_link_libraries(runDeckFloatItemTests Parser ${Boost_LIBRARIES})
add_test(NAME runDeckFloatItemTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckFloatItemTests )
add_executable(runDeckStringItemTests DeckStringItemTests.cpp)
target_link_libraries(runDeckStringItemTests Parser ${Boost_LIBRARIES})
add_test(NAME runDeckStringItemTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckStringItemTests )
add_executable(runDeckTests DeckTests.cpp)
target_link_libraries(runDeckTests Parser ${Boost_LIBRARIES})
add_test(NAME runDeckTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckTests )
add_executable(runDeckKeywordTests DeckKeywordTests.cpp)
target_link_libraries(runDeckKeywordTests Parser ${Boost_LIBRARIES})
add_test(NAME runDeckKeywordTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDeckKeywordTests )
add_executable(runSectionTests SectionTests.cpp)
target_link_libraries(runSectionTests Parser ${Boost_LIBRARIES})
add_test(NAME runSectionTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runSectionTests )
foreach(tapp DeckRecordTests DeckIntItemTests DeckDoubleItemTests
DeckFloatItemTests DeckStringItemTests
DeckTests DeckKeywordTests SectionTests)
opm_add_test(run${tapp} SOURCES ${tapp}.cpp
LIBRARIES Parser ${Boost_LIBRARIES})
endforeach()
@@ -1,65 +1,7 @@
add_executable(runEclipseGridTests EclipseGridTests.cpp)
target_link_libraries(runEclipseGridTests Parser ${Boost_LIBRARIES})
add_test(NAME runEclipseGridTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runEclipseGridTests )
add_executable(runMULTREGTScannerTests MULTREGTScannerTests.cpp)
target_link_libraries(runMULTREGTScannerTests Parser ${Boost_LIBRARIES})
add_test(NAME runMULTREGTScannerTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runMULTREGTScannerTests )
add_executable(runGridPropertyTests GridPropertyTests.cpp)
target_link_libraries(runGridPropertyTests Parser ${Boost_LIBRARIES})
add_test(NAME runGridPropertyTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runGridPropertyTests )
add_executable(runFaceDirTests FaceDirTests.cpp)
target_link_libraries(runFaceDirTests Parser ${Boost_LIBRARIES})
add_test(NAME runFaceDirTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runFaceDirTests )
add_executable(runGridPropertiesTests GridPropertiesTests.cpp)
target_link_libraries(runGridPropertiesTests Parser ${Boost_LIBRARIES})
add_test(NAME runGridPropertiesTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runGridPropertiesTests )
add_executable(runBoxTests BoxTests.cpp)
target_link_libraries(runBoxTests Parser ${Boost_LIBRARIES})
add_test(NAME runBoxTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runBoxTests )
add_executable(runPORVTests PORVTests.cpp)
target_link_libraries(runPORVTests Parser ${Boost_LIBRARIES})
add_test(NAME runPORVTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runPORVTests )
add_executable(runBoxManagerTests BoxManagerTests.cpp)
target_link_libraries(runBoxManagerTests Parser ${Boost_LIBRARIES})
add_test(NAME runBoxManagerTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runBoxManagerTests )
add_executable(runTransMultTests TransMultTests.cpp)
target_link_libraries(runTransMultTests Parser ${Boost_LIBRARIES})
add_test(NAME runTransMultTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runTransMultTests )
add_executable(runFaultTests FaultTests.cpp)
target_link_libraries(runFaultTests Parser ${Boost_LIBRARIES})
add_test(NAME runFaultTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runFaultTests )
add_executable(runEqualRegTests EqualRegTests.cpp)
target_link_libraries(runEqualRegTests Parser ${Boost_LIBRARIES})
add_test(NAME runEqualRegTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runEqualRegTests )
add_executable(runMultiRegTests MultiRegTests.cpp)
target_link_libraries(runMultiRegTests Parser ${Boost_LIBRARIES})
add_test(NAME runMultiRegTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runMultiRegTests )
add_executable(runADDREGTests ADDREGTests.cpp)
target_link_libraries(runADDREGTests Parser ${Boost_LIBRARIES})
add_test(NAME runADDREGTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runADDREGTests )
add_executable(runCopyRegTests CopyRegTests.cpp)
target_link_libraries(runCopyRegTests Parser ${Boost_LIBRARIES})
add_test(NAME runCopyRegTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runCopyRegTests )
foreach(tapp EclipseGridTests MULTREGTScannerTests GridPropertyTests
FaceDirTests GridPropertiesTests BoxTests PORVTests
BoxManagerTests TransMultTests FaultTests
EqualRegTests MultiRegTests ADDREGTests CopyRegTests)
opm_add_test(run${tapp} SOURCES ${tapp}.cpp
LIBRARIES Parser ${Boost_LIBRARIES})
endforeach()
@@ -1,63 +1,9 @@
add_executable(runTimeMapTests TimeMapTest.cpp)
target_link_libraries(runTimeMapTests Parser ${Boost_LIBRARIES})
add_test(NAME runTimeMapTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runTimeMapTests )
add_executable(runScheduleTests ScheduleTests.cpp)
target_link_libraries(runScheduleTests Parser ${Boost_LIBRARIES})
add_test(NAME runScheduleTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runScheduleTests )
add_executable(runWellTests WellTests.cpp)
target_link_libraries(runWellTests Parser ${Boost_LIBRARIES})
add_test(NAME runWellTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runWellTests )
add_executable(runWellPropertiesTests WellPropertiesTests.cpp)
target_link_libraries(runWellPropertiesTests Parser ${Boost_LIBRARIES})
add_test(NAME runWellPropertiesTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runWellPropertiesTests )
add_executable(runWellSetTests WellSetTests.cpp)
target_link_libraries(runWellSetTests Parser ${Boost_LIBRARIES})
add_test(NAME runWellSetTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runWellSetTests )
add_executable(runGroupTests GroupTests.cpp)
target_link_libraries(runGroupTests Parser ${Boost_LIBRARIES})
add_test(NAME runGroupTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runGroupTests )
add_executable(runScheduleEnumTests ScheduleEnumTests.cpp)
target_link_libraries(runScheduleEnumTests Parser ${Boost_LIBRARIES})
add_test(NAME runScheduleEnumTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runScheduleEnumTests )
add_executable(runCompletionTests CompletionTests.cpp)
target_link_libraries(runCompletionTests Parser ${Boost_LIBRARIES})
add_test(NAME runCompletionTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runCompletionTests )
add_executable(runCompletionSetTests CompletionSetTests.cpp)
target_link_libraries(runCompletionSetTests Parser ${Boost_LIBRARIES})
add_test(NAME runCompletionSetTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runCompletionSetTests )
add_executable(runDynamicStateTests DynamicStateTests.cpp)
target_link_libraries(runDynamicStateTests Parser ${Boost_LIBRARIES})
add_test(NAME runDynamicStateTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runDynamicStateTests )
add_executable(runGroupTreeNodeTests GroupTreeNodeTests.cpp)
target_link_libraries(runGroupTreeNodeTests Parser ${Boost_LIBRARIES})
add_test(NAME runGroupTreeNodeTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runGroupTreeNodeTests )
add_executable(runGroupTreeTests GroupTreeTests.cpp)
target_link_libraries(runGroupTreeTests Parser ${Boost_LIBRARIES})
add_test(NAME runGroupTreeTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runGroupTreeTests )
add_executable(runTuningTests TuningTests.cpp)
target_link_libraries(runTuningTests Parser ${Boost_LIBRARIES})
add_test(NAME runTuningTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runTuningTests )
foreach(tapp TimeMapTest ScheduleTests WellTests
WellPropertiesTests WellSetTests
GroupTests ScheduleEnumTests
CompletionTests CompletionSetTests
DynamicStateTests GroupTreeNodeTests
GroupTreeTests TuningTests)
opm_add_test(run${tapp} SOURCES ${tapp}.cpp
LIBRARIES Parser ${Boost_LIBRARIES})
endforeach()
@@ -1,8 +1,4 @@
add_executable(runThresholdPressureTests ThresholdPressureTest.cpp)
target_link_libraries(runThresholdPressureTests Parser ${Boost_LIBRARIES})
add_test(NAME runThresholdPressureTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runThresholdPressureTests )
add_executable(runSimulationConfigTests SimulationConfigTest.cpp)
target_link_libraries(runSimulationConfigTests Parser ${Boost_LIBRARIES})
add_test(NAME runSimulationConfigTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runSimulationConfigTests )
foreach(tapp ThresholdPressureTest SimulationConfigTest)
opm_add_test(run${tapp} SOURCES ${tapp}.cpp
LIBRARIES Parser ${Boost_LIBRARIES})
endforeach()
@@ -1,7 +1,4 @@
add_executable(runTableTests TableTests.cpp)
target_link_libraries(runTableTests Parser ${Boost_LIBRARIES})
add_test(NAME runTableTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runTableTests )
add_executable(runTabdimsTests TabdimsTests.cpp)
target_link_libraries(runTabdimsTests Parser ${Boost_LIBRARIES})
add_test(NAME runTabdimsTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runTabdimsTests )
foreach(tapp TableTests TabdimsTests)
opm_add_test(run${tapp} SOURCES ${tapp}.cpp
LIBRARIES Parser ${Boost_LIBRARIES})
endforeach()
@@ -1,15 +1,4 @@
add_executable(runOrderedMapTests OrderedMapTests.cpp)
target_link_libraries(runOrderedMapTests Parser ${Boost_LIBRARIES})
add_test(NAME runOrderedMapTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runOrderedMapTests )
add_executable(runValueTests ValueTests.cpp)
target_link_libraries(runValueTests Parser ${Boost_LIBRARIES})
add_test(NAME runValueTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runValueTests )
add_executable(runElasticVectorTests ElasticVectorTests.cpp)
target_link_libraries(runElasticVectorTests Parser ${Boost_LIBRARIES})
add_test(NAME runElasticVectorTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runElasticVectorTests )
foreach(tapp OrderedMapTests ValueTests ElasticVectorTests)
opm_add_test(run${tapp} SOURCES ${tapp}.cpp
LIBRARIES Parser ${Boost_LIBRARIES})
endforeach()
@@ -1,3 +1,2 @@
add_executable(runEclipseStateTests EclipseStateTests.cpp)
target_link_libraries(runEclipseStateTests Parser ${Boost_LIBRARIES})
add_test(NAME runEclipseStateTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runEclipseStateTests )
opm_add_test(runEclipseStateTests SOURCES EclipseStateTests.cpp
LIBRARIES Parser ${Boost_LIBRARIES})
@@ -1,137 +1,12 @@
add_definitions( -DKEYWORD_DIRECTORY="${PROJECT_SOURCE_DIR}/opm/parser/share/keywords/000_Eclipse100")
add_executable(runCheckDeckValidity CheckDeckValidity.cpp)
target_link_libraries(runCheckDeckValidity Parser ${Boost_LIBRARIES})
add_test(NAME runCheckDeckValidity WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runCheckDeckValidity)
add_executable(runIntegrationTests IntegrationTests.cpp)
target_link_libraries(runIntegrationTests Parser ${Boost_LIBRARIES})
add_test(NAME runIntegrationTests WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runIntegrationTests)
set_property(SOURCE IntegrationTests.cpp PROPERTY COMPILE_FLAGS "-Wno-error")
add_executable(runParseWellProbe ParseWellProbe.cpp)
target_link_libraries(runParseWellProbe Parser ${Boost_LIBRARIES})
add_test(NAME runParseWellProbe WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runParseWellProbe)
add_executable(runParseTITLE ParseTITLE.cpp)
target_link_libraries(runParseTITLE Parser ${Boost_LIBRARIES})
add_test(NAME runParseTITLE WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runParseTITLE)
add_executable(runParseTOPS ParseTOPS.cpp)
target_link_libraries(runParseTOPS Parser ${Boost_LIBRARIES})
add_test(NAME runParseTOPS WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runParseTOPS)
add_executable(runParseWCONHIST ParseWCONHIST.cpp)
target_link_libraries(runParseWCONHIST Parser ${Boost_LIBRARIES})
add_test(NAME runParseWCONHIST WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseWCONHIST)
add_executable(runParseWellWithWildcards ParseWellWithWildcards.cpp)
target_link_libraries(runParseWellWithWildcards Parser ${Boost_LIBRARIES})
add_test(NAME runParseWellWithWildcards WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseWellWithWildcards)
add_executable(runParsePORO ParsePORO.cpp)
target_link_libraries(runParsePORO Parser ${Boost_LIBRARIES})
add_test(NAME runParsePORO WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParsePORO)
add_executable(runParsePLYVISC ParsePLYVISC.cpp)
target_link_libraries(runParsePLYVISC Parser ${Boost_LIBRARIES})
add_test(NAME runParsePLYVISC WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParsePLYVISC)
add_executable(runParsePLYSHLOG ParsePLYSHLOG.cpp)
target_link_libraries(runParsePLYSHLOG Parser ${Boost_LIBRARIES})
add_test(NAME runParsePLYSHLOG WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParsePLYSHLOG)
add_executable(runParsePLYADS ParsePLYADS.cpp)
target_link_libraries(runParsePLYADS Parser ${Boost_LIBRARIES})
add_test(NAME runParsePLYADS WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParsePLYADS)
add_executable(runParseDATAWithDefault ParseDATAWithDefault.cpp)
target_link_libraries(runParseDATAWithDefault Parser ${Boost_LIBRARIES})
add_test(NAME runParseDATAWithDefault WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseDATAWithDefault)
add_executable(runParseTVDP ParseTVDP.cpp)
target_link_libraries(runParseTVDP Parser ${Boost_LIBRARIES})
add_test(NAME runParseTVDP WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseTVDP)
add_executable(runParseDENSITY ParseDENSITY.cpp)
target_link_libraries(runParseDENSITY Parser ${Boost_LIBRARIES})
add_test(NAME runParseDENSITY WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseDENSITY)
add_executable(runParseVFPPROD ParseVFPPROD.cpp)
target_link_libraries(runParseVFPPROD Parser ${Boost_LIBRARIES})
add_test(NAME runParseVFPPROD WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseVFPPROD)
add_executable(runScheduleCreateFromDeck ScheduleCreateFromDeck.cpp)
target_link_libraries(runScheduleCreateFromDeck Parser ${Boost_LIBRARIES})
add_test(NAME runScheduleCreateFromDeck WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runScheduleCreateFromDeck)
add_executable(runCompletionsFromDeck CompletionsFromDeck.cpp)
target_link_libraries(runCompletionsFromDeck Parser ${Boost_LIBRARIES})
add_test(NAME runCompletionsFromDeck WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runCompletionsFromDeck)
add_executable(runParseEND ParseEND.cpp)
target_link_libraries(runParseEND Parser ${Boost_LIBRARIES})
add_test(NAME runParseEND WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND runParseEND)
add_executable(runIncludeTest IncludeTest.cpp)
target_link_libraries(runIncludeTest Parser ${Boost_LIBRARIES})
add_test(NAME runIncludeTest WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runIncludeTest)
add_executable(runParseEQUIL ParseEQUIL.cpp)
target_link_libraries(runParseEQUIL Parser ${Boost_LIBRARIES})
add_test(NAME runParseEQUIL
WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseEQUIL)
add_executable(runParseRSVD ParseRSVD.cpp)
target_link_libraries(runParseRSVD Parser ${Boost_LIBRARIES})
add_test(NAME runParseRSVD
WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseRSVD)
add_executable(runParsePVTG ParsePVTG.cpp)
target_link_libraries(runParsePVTG Parser ${Boost_LIBRARIES})
add_test(NAME runParsePVTG
WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParsePVTG)
add_executable(runParsePVTO ParsePVTO.cpp)
target_link_libraries(runParsePVTO Parser ${Boost_LIBRARIES})
add_test(NAME runParsePVTO
WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParsePVTO)
add_executable(runParseSWOF ParseSWOF.cpp)
target_link_libraries(runParseSWOF Parser ${Boost_LIBRARIES})
add_test(NAME runParseSWOF
WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseSWOF)
add_executable(runBoxTest BoxTest.cpp)
target_link_libraries(runBoxTest Parser ${Boost_LIBRARIES})
add_test(NAME runBoxTest
WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runBoxTest)
add_executable(runParseMULTREGT ParseMULTREGT.cpp)
target_link_libraries(runParseMULTREGT Parser ${Boost_LIBRARIES})
add_test(NAME runParseMULTREGT
WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseMULTREGT)
add_executable(runParseSGOF ParseSGOF.cpp)
target_link_libraries(runParseSGOF Parser ${Boost_LIBRARIES})
add_test(NAME runParseSGOF
WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParseSGOF)
add_executable(runEclipseGridCreateFromDeck EclipseGridCreateFromDeck.cpp)
target_link_libraries(runEclipseGridCreateFromDeck Parser ${Boost_LIBRARIES})
add_test(NAME runEclipseGridCreateFromDeck WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runEclipseGridCreateFromDeck)
foreach(tapp CheckDeckValidity IntegrationTests ParseWellProbe
ParseTITLE ParseTOPS ParseWCONHIST ParseWellWithWildcards
ParsePORO ParsePLYVISC ParsePLYSHLOG ParseDATAWithDefault
ParseTVDP ParseDENSITY ParseVFPPROD ScheduleCreateFromDeck
CompletionsFromDeck ParseEND IncludeTest ParseEQUIL
ParseRSVD ParsePVTG ParsePVTO ParseSWOF BoxTest
ParseMULTREGT ParseSGOF EclipseGridCreateFromDeck)
opm_add_test(run${tapp} SOURCES ${tapp}.cpp
LIBRARIES Parser ${Boost_LIBRARIES})
endforeach()
@@ -1,3 +1,3 @@
add_executable(runOpmLogTests OpmLogTests.cpp)
target_link_libraries(runOpmLogTests Parser ${Boost_LIBRARIES})
add_test(NAME runOpmLogTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runOpmLogTests )
opm_add_test(runOpmLogTests SOURCES OpmLogTests.cpp
EXE_NAME runOpmLogTests
LIBRARIES Parser ${Boost_LIBRARIES})
+18 -36
View File
@@ -1,45 +1,27 @@
add_executable(runParserTests ParserTests.cpp)
add_executable(runParserKeywordTests ParserKeywordTests.cpp)
add_executable(runParserRecordTests ParserRecordTests.cpp)
add_executable(runParserItemTests ParserItemTests.cpp)
add_executable(runParserEnumTests ParserEnumTests.cpp)
add_executable(runParserIncludeTests ParserIncludeTests.cpp)
target_link_libraries(runParserTests Parser ${Boost_LIBRARIES})
target_link_libraries(runParserKeywordTests Parser ${Boost_LIBRARIES})
target_link_libraries(runParserRecordTests Parser ${Boost_LIBRARIES})
target_link_libraries(runParserItemTests Parser ${Boost_LIBRARIES})
target_link_libraries(runParserIncludeTests Parser ${Boost_LIBRARIES})
target_link_libraries(runParserEnumTests Parser ${Boost_LIBRARIES})
add_test(NAME runParserTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParserTests )
add_test(NAME runParserKeywordTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParserKeywordTests )
add_test(NAME runParserRecordTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParserRecordTests )
add_test(NAME runParserItemTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParserItemTests )
add_test(NAME runParserIncludeTests WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParserIncludeTests )
add_test(NAME runParserEnumTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runParserEnumTests )
foreach(tapp ParserTests ParserKeywordTests ParserRecordTests
ParserItemTests ParserEnumTests ParserIncludeTests)
opm_add_test(run${tapp} SOURCES ${tapp}.cpp
LIBRARIES Parser ${Boost_LIBRARIES})
endforeach()
set_property(SOURCE ParserRecordTests.cpp PROPERTY COMPILE_FLAGS "-Wno-error")
#-----------------------------------------------------------------
add_executable( createInlineItemTest createInlineItemTest.cpp )
target_link_libraries( createInlineItemTest buildParser ${Boost_LIBRARIES} )
add_executable( createInlineItemTest EXCLUDE_FROM_ALL createInlineItemTest.cpp)
target_link_libraries( createInlineItemTest Parser ${Boost_LIBRARIES})
add_custom_command( OUTPUT ${PROJECT_BINARY_DIR}/generated-source/inlineItemTest.cpp
COMMAND createInlineItemTest ${PROJECT_BINARY_DIR}/generated-source/inlineItemTest.cpp inlineItemTest
DEPENDS createInlineItemTest )
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/generated-source/inlineItemTest.cpp
COMMAND createInlineItemTest ${PROJECT_BINARY_DIR}/generated-source/inlineItemTest.cpp inlineItemTest
DEPENDS createInlineItemTest )
add_executable( inlineItemTest ${PROJECT_BINARY_DIR}/generated-source/inlineItemTest.cpp )
add_dependencies( inlineItemTest keywordlist )
target_link_libraries( inlineItemTest buildParser ${Boost_LIBRARIES} )
add_test(inlineItemTest ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/inlineItemTest)
foreach(tapp inlineItemTest inlineKeywordTest)
opm_add_test(run${tapp}
SOURCES ${PROJECT_BINARY_DIR}/generated-source/${tapp}.cpp
LIBRARIES buildParser ${Boost_LIBRARIES}
DEPENDS keywordlist)
endforeach()
#-----------------------------------------------------------------
SET_SOURCE_FILES_PROPERTIES(${PROJECT_BINARY_DIR}/generated-source/inlineKeywordTest.cpp PROPERTIES GENERATED TRUE)
add_executable( inlineKeywordTest ${PROJECT_BINARY_DIR}/generated-source/inlineKeywordTest.cpp )
add_dependencies( inlineKeywordTest keywordlist )
target_link_libraries( inlineKeywordTest buildParser ${Boost_LIBRARIES} )
add_test(inlineKeywordTest ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/inlineKeywordTest)
set_source_files_properties(${PROJECT_BINARY_DIR}/generated-source/inlineKeywordTest.cpp PROPERTIES GENERATED TRUE)
set_source_files_properties(${PROJECT_BINARY_DIR}/generated-source/inlineItemTest.cpp PROPERTIES GENERATED TRUE)
@@ -1,11 +1,4 @@
add_executable(runStarTokenTests StarTokenTests.cpp)
add_executable(runRawRecordTests RawRecordTests.cpp)
add_executable(runRawKeywordTests RawKeywordTests.cpp)
target_link_libraries(runStarTokenTests Parser ${Boost_LIBRARIES})
target_link_libraries(runRawRecordTests Parser ${Boost_LIBRARIES})
target_link_libraries(runRawKeywordTests Parser ${Boost_LIBRARIES})
add_test(NAME runRawRecordTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runRawRecordTests )
add_test(NAME runRawKeywordTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runRawKeywordTests )
add_test(NAME runStarTokenTests COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runStarTokenTests )
foreach(tapp StarTokenTests RawRecordTests RawKeywordTests)
opm_add_test(run${tapp} SOURCES ${tapp}.cpp
LIBRARIES Parser ${Boost_LIBRARIES})
endforeach()
+2 -3
View File
@@ -1,3 +1,2 @@
add_executable(runErtTests test_ert_wrapper.cpp)
target_link_libraries(runErtTests Parser ${Boost_LIBRARIES})
add_test(NAME runErtTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${TEST_MEMCHECK_TOOL} ${EXECUTABLE_OUTPUT_PATH}/runErtTests )
opm_add_test(runErtTests SOURCES test_ert_wrapper.cpp
LIBRARIES Parser ${Boost_LIBRARIES})