Refs #11823. Add the rest of Framework.

mantidproject · May 22, 2015 · 97f0a67 · 97f0a67
1 parent f7c5375
commit 97f0a67
Show file tree

Hide file tree

Showing 24 changed files with 130 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)