From 97f0a67de93fe12a0d0681bba335f90bdda6fe7d Mon Sep 17 00:00:00 2001 From: Steven Hahn Date: Fri, 22 May 2015 17:29:40 -0400 Subject: [PATCH] Refs #11823. Add the rest of Framework. --- Code/Mantid/Build/CMake/Coveralls.cmake | 2 +- Code/Mantid/CMakeLists.txt | 9 +++++++++ Code/Mantid/Framework/API/CMakeLists.txt | 6 ++++++ Code/Mantid/Framework/Algorithms/CMakeLists.txt | 6 ++++++ Code/Mantid/Framework/Crystal/CMakeLists.txt | 6 ++++++ Code/Mantid/Framework/CurveFitting/CMakeLists.txt | 5 +++++ Code/Mantid/Framework/DataHandling/CMakeLists.txt | 5 +++++ Code/Mantid/Framework/DataObjects/CMakeLists.txt | 6 ++++++ Code/Mantid/Framework/GPUAlgorithms/CMakeLists.txt | 5 +++++ Code/Mantid/Framework/Geometry/CMakeLists.txt | 5 +++++ Code/Mantid/Framework/ICat/CMakeLists.txt | 6 ++++++ Code/Mantid/Framework/ISISLiveData/CMakeLists.txt | 5 +++++ Code/Mantid/Framework/Kernel/CMakeLists.txt | 12 ++---------- Code/Mantid/Framework/LiveData/CMakeLists.txt | 5 +++++ Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt | 6 ++++++ Code/Mantid/Framework/MPIAlgorithms/CMakeLists.txt | 6 ++++++ Code/Mantid/Framework/MatlabAPI/CMakeLists.txt | 6 ++++++ Code/Mantid/Framework/Nexus/CMakeLists.txt | 6 ++++++ .../Mantid/Framework/RemoteAlgorithms/CMakeLists.txt | 6 ++++++ .../Framework/RemoteJobManagers/CMakeLists.txt | 6 ++++++ Code/Mantid/Framework/SINQ/CMakeLists.txt | 5 +++++ .../Mantid/Framework/ScriptRepository/CMakeLists.txt | 5 +++++ Code/Mantid/Framework/UserAlgorithms/CMakeLists.txt | 6 ++++++ .../Framework/WorkflowAlgorithms/CMakeLists.txt | 6 ++++++ 24 files changed, 130 insertions(+), 11 deletions(-) diff --git a/Code/Mantid/Build/CMake/Coveralls.cmake b/Code/Mantid/Build/CMake/Coveralls.cmake index 0aefbec0ad75..3bb72d5ebb04 100644 --- a/Code/Mantid/Build/CMake/Coveralls.cmake +++ b/Code/Mantid/Build/CMake/Coveralls.cmake @@ -73,7 +73,7 @@ function(coveralls_setup _COVERAGE_SRCS _COVERALLS_UPLOAD) -P "${_CMAKE_SCRIPT_PATH}/CoverallsClear.cmake" # Run regress tests. - COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure + #COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure # Generate Gcov and translate it into coveralls JSON. # We do this by executing an external CMake script. diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt index c9c179776b32..4b511c570fda 100644 --- a/Code/Mantid/CMakeLists.txt +++ b/Code/Mantid/CMakeLists.txt @@ -205,6 +205,15 @@ add_subdirectory ( docs ) # System test data target add_subdirectory ( Testing/SystemTests/scripts ) +if (COVERALLS) + get_property(ALL_SRCS GLOBAL PROPERTY COVERAGE_SRCS) + coveralls_setup( + "${ALL_SRCS}" + OFF + "${CMAKE_SOURCE_DIR}/Build/CMake" + ) +endif () + ########################################################################### # Installation settings ########################################################################### diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt index 363257c25e21..9a0f00475f77 100644 --- a/Code/Mantid/Framework/API/CMakeLists.txt +++ b/Code/Mantid/Framework/API/CMakeLists.txt @@ -403,6 +403,12 @@ set ( GMOCK_TEST_FILES MatrixWorkspaceTest.h ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES} ) + message(STATUS "loop_var:${loop_var}") + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() if(UNITY_BUILD) include(UnityBuild) diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt index 012f793358d5..62a4a90e9878 100644 --- a/Code/Mantid/Framework/Algorithms/CMakeLists.txt +++ b/Code/Mantid/Framework/Algorithms/CMakeLists.txt @@ -767,6 +767,12 @@ set ( TEST_FILES set ( TEST_PY_FILES NormaliseToUnityTest.py ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + # Add a precompiled header where they are supported enable_precompiled_headers ( inc/MantidAlgorithms/PrecompiledHeader.h SRC_FILES ) # Add the target for this directory diff --git a/Code/Mantid/Framework/Crystal/CMakeLists.txt b/Code/Mantid/Framework/Crystal/CMakeLists.txt index 2883188735a0..fb86a1a5fc41 100644 --- a/Code/Mantid/Framework/Crystal/CMakeLists.txt +++ b/Code/Mantid/Framework/Crystal/CMakeLists.txt @@ -214,6 +214,12 @@ if(UNITY_BUILD) enable_unity_build(Crystal SRC_FILES SRC_UNITY_IGNORE_FILES 10) endif(UNITY_BUILD) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + # Add the target for this directory add_library ( Crystal ${SRC_FILES} ${INC_FILES}) # Set the name of the generated library diff --git a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt index 071d416d4897..a39e4c433ab8 100644 --- a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt +++ b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt @@ -335,6 +335,11 @@ set ( TEST_FILES VoigtTest.h ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() if(UNITY_BUILD) include(UnityBuild) diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt index 13074e09f670..ceab2f6f9fba 100644 --- a/Code/Mantid/Framework/DataHandling/CMakeLists.txt +++ b/Code/Mantid/Framework/DataHandling/CMakeLists.txt @@ -445,6 +445,11 @@ set ( TEST_FILES XMLInstrumentParameterTest.h ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() if(UNITY_BUILD) include(UnityBuild) diff --git a/Code/Mantid/Framework/DataObjects/CMakeLists.txt b/Code/Mantid/Framework/DataObjects/CMakeLists.txt index 318f1d982611..734324adf0aa 100644 --- a/Code/Mantid/Framework/DataObjects/CMakeLists.txt +++ b/Code/Mantid/Framework/DataObjects/CMakeLists.txt @@ -178,6 +178,12 @@ if(UNITY_BUILD) enable_unity_build(DataObjects SRC_FILES SRC_UNITY_IGNORE_FILES 10) endif(UNITY_BUILD) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + # Use a precompiled header where they are supported enable_precompiled_headers( inc/MantidDataObjects/PrecompiledHeader.h SRC_FILES ) # Add the target for this directory diff --git a/Code/Mantid/Framework/GPUAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/GPUAlgorithms/CMakeLists.txt index 3bbf129d9375..280b31fec8a1 100644 --- a/Code/Mantid/Framework/GPUAlgorithms/CMakeLists.txt +++ b/Code/Mantid/Framework/GPUAlgorithms/CMakeLists.txt @@ -20,6 +20,11 @@ set ( KERNEL_FILES GPUTester_kernel.cl ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() # Add the target for this directory add_library ( GPUAlgorithms ${SRC_FILES} ${INC_FILES} ) diff --git a/Code/Mantid/Framework/Geometry/CMakeLists.txt b/Code/Mantid/Framework/Geometry/CMakeLists.txt index e3dcd91ad41c..7389720b3265 100644 --- a/Code/Mantid/Framework/Geometry/CMakeLists.txt +++ b/Code/Mantid/Framework/Geometry/CMakeLists.txt @@ -336,6 +336,11 @@ set ( GMOCK_TEST_FILES MDGeometryXMLBuilderTest.h ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() if(UNITY_BUILD) include(UnityBuild) diff --git a/Code/Mantid/Framework/ICat/CMakeLists.txt b/Code/Mantid/Framework/ICat/CMakeLists.txt index f559f9857ef2..09c23e440c19 100644 --- a/Code/Mantid/Framework/ICat/CMakeLists.txt +++ b/Code/Mantid/Framework/ICat/CMakeLists.txt @@ -65,6 +65,12 @@ set ( TEST_FILES CompositeCatalogTest.h ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + if(UNITY_BUILD) include(UnityBuild) enable_unity_build(ICat SRC_FILES SRC_UNITY_IGNORE_FILES 10) diff --git a/Code/Mantid/Framework/ISISLiveData/CMakeLists.txt b/Code/Mantid/Framework/ISISLiveData/CMakeLists.txt index 056e097543e5..583bb56c1fb3 100644 --- a/Code/Mantid/Framework/ISISLiveData/CMakeLists.txt +++ b/Code/Mantid/Framework/ISISLiveData/CMakeLists.txt @@ -12,6 +12,11 @@ set ( INC_FILES set ( TEST_FILES ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() # Use a precompiled header where they are supported #enable_precompiled_headers( inc/MantidISISLiveData/PrecompiledHeader.h SRC_FILES ) diff --git a/Code/Mantid/Framework/Kernel/CMakeLists.txt b/Code/Mantid/Framework/Kernel/CMakeLists.txt index 1f2afec2ef13..f78bbc9b6aa8 100644 --- a/Code/Mantid/Framework/Kernel/CMakeLists.txt +++ b/Code/Mantid/Framework/Kernel/CMakeLists.txt @@ -361,19 +361,11 @@ set ( TEST_FILES ) if (COVERALLS) - set(COVERAGE_SRCS "") - foreach( loop_var ${SRCS_FILES} ${INC_FILES}) - LIST(APPEND COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") endforeach(loop_var) - #Create the coveralls target. - coveralls_setup( - "${COVERAGE_SRCS}" - OFF - "${CMAKE_SOURCE_DIR}/Build/CMake" - ) endif() - if ( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") LIST( APPEND SRC_FILES src/NetworkProxyOSX.cpp ) SET( NETWORK_LIBRARIES "-framework SystemConfiguration" "-framework CoreFoundation" "-framework CoreServices") diff --git a/Code/Mantid/Framework/LiveData/CMakeLists.txt b/Code/Mantid/Framework/LiveData/CMakeLists.txt index a0b01e63b42c..b3fdfac21fce 100644 --- a/Code/Mantid/Framework/LiveData/CMakeLists.txt +++ b/Code/Mantid/Framework/LiveData/CMakeLists.txt @@ -52,6 +52,11 @@ set ( TEST_FILES StartLiveDataTest.h ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() if(UNITY_BUILD) include(UnityBuild) diff --git a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt index 73fc2144b86b..713d54044439 100644 --- a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt +++ b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt @@ -346,6 +346,12 @@ set ( GMOCK_TEST_FILES BinMDTest.h ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + if(UNITY_BUILD) include(UnityBuild) enable_unity_build(MDAlgorithms SRC_FILES SRC_UNITY_IGNORE_FILES 10) diff --git a/Code/Mantid/Framework/MPIAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MPIAlgorithms/CMakeLists.txt index 7d245cdf0caa..664666802fe6 100644 --- a/Code/Mantid/Framework/MPIAlgorithms/CMakeLists.txt +++ b/Code/Mantid/Framework/MPIAlgorithms/CMakeLists.txt @@ -11,6 +11,12 @@ set ( TEST_FILES BroadcastWorkspaceTest.h GatherWorkspacesTest.h ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + # Add the target for this directory add_library ( MPIAlgorithms ${SRC_FILES} ${INC_FILES} ) # Set the name of the generated library diff --git a/Code/Mantid/Framework/MatlabAPI/CMakeLists.txt b/Code/Mantid/Framework/MatlabAPI/CMakeLists.txt index 2923171c59a1..14cb3025ea4d 100644 --- a/Code/Mantid/Framework/MatlabAPI/CMakeLists.txt +++ b/Code/Mantid/Framework/MatlabAPI/CMakeLists.txt @@ -4,6 +4,12 @@ set ( SRC_FILES set ( INC_FILES ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + add_definitions ( -DIN_MANTID_MATLAB_API -DMATLAB_MEX_FILE=1 ) include_directories ( inc ) diff --git a/Code/Mantid/Framework/Nexus/CMakeLists.txt b/Code/Mantid/Framework/Nexus/CMakeLists.txt index be0de2a44fb6..2208a123dae4 100644 --- a/Code/Mantid/Framework/Nexus/CMakeLists.txt +++ b/Code/Mantid/Framework/Nexus/CMakeLists.txt @@ -14,6 +14,12 @@ set ( TEST_FILES test/NexusAPITest.h ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + add_definitions ( -DIN_NEXUS_CPP_LIBRARY ) # Add the target for this directory diff --git a/Code/Mantid/Framework/RemoteAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/RemoteAlgorithms/CMakeLists.txt index bef9b585d4ec..9b69bd26fb90 100644 --- a/Code/Mantid/Framework/RemoteAlgorithms/CMakeLists.txt +++ b/Code/Mantid/Framework/RemoteAlgorithms/CMakeLists.txt @@ -78,6 +78,12 @@ set ( TEST_FILES #) # No tests yet... +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + # Not for now, remember later if convenient: Add a precompiled header where they are supported # enable_precompiled_headers ( inc/MantidRemoteAlgorithms/PrecompiledHeader.h SRC_FILES ) diff --git a/Code/Mantid/Framework/RemoteJobManagers/CMakeLists.txt b/Code/Mantid/Framework/RemoteJobManagers/CMakeLists.txt index 864246c9578d..80df6da77c32 100644 --- a/Code/Mantid/Framework/RemoteJobManagers/CMakeLists.txt +++ b/Code/Mantid/Framework/RemoteJobManagers/CMakeLists.txt @@ -26,6 +26,12 @@ set ( TEST_FILES #) # No Python tests yet... +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + # Not for now, remember later if convenient: Add a precompiled header where they are supported # enable_precompiled_headers ( inc/MantidRemoteJobManagers/PrecompiledHeader.h SRC_FILES ) diff --git a/Code/Mantid/Framework/SINQ/CMakeLists.txt b/Code/Mantid/Framework/SINQ/CMakeLists.txt index d4e8c944761e..21b85961503f 100644 --- a/Code/Mantid/Framework/SINQ/CMakeLists.txt +++ b/Code/Mantid/Framework/SINQ/CMakeLists.txt @@ -130,6 +130,11 @@ set ( TEST_FILES UncertainValueTest.h ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() # Add a precompiled header where they are supported enable_precompiled_headers ( inc/MantidSINQ/PrecompiledHeader.h SRC_FILES ) diff --git a/Code/Mantid/Framework/ScriptRepository/CMakeLists.txt b/Code/Mantid/Framework/ScriptRepository/CMakeLists.txt index 19d5d8dde518..301327740d88 100644 --- a/Code/Mantid/Framework/ScriptRepository/CMakeLists.txt +++ b/Code/Mantid/Framework/ScriptRepository/CMakeLists.txt @@ -11,6 +11,11 @@ set ( TEST_FILES ScriptRepositoryTestImpl.h ) +if (COVERALLS) + foreach( loop_var ${SRCS_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() # Add the target for this directory add_library ( ScriptRepository ${SRC_FILES} ${INC_FILES} ) diff --git a/Code/Mantid/Framework/UserAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/UserAlgorithms/CMakeLists.txt index d563012295fd..948f8d232347 100644 --- a/Code/Mantid/Framework/UserAlgorithms/CMakeLists.txt +++ b/Code/Mantid/Framework/UserAlgorithms/CMakeLists.txt @@ -16,6 +16,12 @@ set ( INC_FILES HelloWorldAlgorithm.h WorkspaceAlgorithm.h ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + if(UNITY_BUILD) include(UnityBuild) enable_unity_build(UserAlgorithms SRC_FILES SRC_UNITY_IGNORE_FILES 10) diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt index 2d4b51d5b641..4c72035f2b24 100644 --- a/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt +++ b/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt @@ -87,6 +87,12 @@ set ( TEST_PY_FILES SANSBeamFluxCorrectionTest.py ) +if (COVERALLS) + foreach( loop_var ${SRC_FILES} ${INC_FILES}) + set_property(GLOBAL APPEND PROPERTY COVERAGE_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${loop_var}") + endforeach(loop_var) +endif() + if(UNITY_BUILD) include(UnityBuild) enable_unity_build(WorkflowAlgorithms SRC_FILES SRC_UNITY_IGNORE_FILES 10)