Merge branch 'master' into 11158_indirect_idr_facility_based_tabs_logic

Refs #11158
mantidproject · Feb 25, 2015 · 7ebe6aa · 7ebe6aa
2 parents 05fd369 + 8a297a1
commit 7ebe6aa
Show file tree

Hide file tree

Showing 927 changed files with 5,688 additions and 1,121 deletions.
diff --git a/Code/Mantid/Build/CMake/CommonSetup.cmake b/Code/Mantid/Build/CMake/CommonSetup.cmake
@@ -305,29 +305,7 @@ endif()
 # External Data for testing
 ###########################################################################
 if ( CXXTEST_FOUND OR PYUNITTEST_FOUND )
- include ( MantidExternalData )
-
-# None of our tests reference files directly as arguments so we have to manually
-# call ExternalData_Expand_Arguments to register the files with the ExternalData
-# mechanism
-get_filename_component ( EXTERNALDATATEST_SOURCE_DIR ${PROJECT_SOURCE_DIR} ABSOLUTE )
-file( GLOB_RECURSE doctest_content_links
-  RELATIVE "${EXTERNALDATATEST_SOURCE_DIR}" "Testing/Data/DocTest/*.md5" )
-file( GLOB_RECURSE unittest_content_links
-  RELATIVE "${EXTERNALDATATEST_SOURCE_DIR}" "Testing/Data/UnitTest/*.md5" )
-set ( content_links "${doctest_content_links};${unittest_content_links}" )
-foreach(link ${content_links})
-  string( REGEX REPLACE "\\.md5$" "" link ${link} )
-  ExternalData_Expand_Arguments( StandardTestData
-    link_location
-    DATA{${link}}
-    )
-endforeach()
-
-# Create target to download data from the StandardTestData group.  This must come after
-# all tests have been added that reference the group, so we put it last.
-ExternalData_Add_Target(StandardTestData)
-set_target_properties(StandardTestData PROPERTIES EXCLUDE_FROM_ALL TRUE)
+  include( SetupDataTargets )
 endif()
 
 ###########################################################################

diff --git a/Code/Mantid/Build/CMake/EmbeddedGTest.cmake b/Code/Mantid/Build/CMake/EmbeddedGTest.cmake
@@ -3,8 +3,8 @@
 # GTEST_FOUND If false, do not try to use Google Test
 
 find_path ( GTEST_INCLUDE_DIR gtest/gtest.h
-            PATHS ${PROJECT_SOURCE_DIR}/TestingTools/gmock-${GMOCK_VERSION}/gtest/include
-                  ${PROJECT_SOURCE_DIR}/../TestingTools/gmock-${GMOCK_VERSION}/gtest/include 
+            PATHS ${PROJECT_SOURCE_DIR}/Testing/Tools/gmock-${GMOCK_VERSION}/gtest/include
+                  ${PROJECT_SOURCE_DIR}/../Testing/Tools/gmock-${GMOCK_VERSION}/gtest/include 
             NO_DEFAULT_PATH )
 
 # handle the QUIETLY and REQUIRED arguments and set GTEST_FOUND to TRUE if 

diff --git a/Code/Mantid/Build/CMake/FindCxxTest.cmake b/Code/Mantid/Build/CMake/FindCxxTest.cmake
@@ -194,8 +194,8 @@ endmacro(CXXTEST_ADD_TEST)
 #=============================================================
 
 find_path(CXXTEST_INCLUDE_DIR cxxtest/TestSuite.h
-          PATHS ${PROJECT_SOURCE_DIR}/TestingTools/cxxtest
-	        ${PROJECT_SOURCE_DIR}/../TestingTools/cxxtest )
+          PATHS ${PROJECT_SOURCE_DIR}/Testing/Tools/cxxtest
+	        ${PROJECT_SOURCE_DIR}/../Testing/Tools/cxxtest )
 
 find_program(CXXTEST_TESTGEN_EXECUTABLE python/scripts/cxxtestgen
              PATHS ${CXXTEST_INCLUDE_DIR})

diff --git a/Code/Mantid/Build/CMake/FindGMock.cmake b/Code/Mantid/Build/CMake/FindGMock.cmake
@@ -17,8 +17,8 @@ ENDIF()
 set (GMOCK_VERSION ${GMOCK_VERSION} CACHE INTERNAL "")
 
 find_path ( GMOCK_INCLUDE_DIR gmock/gmock.h
-            PATHS ${PROJECT_SOURCE_DIR}/TestingTools/gmock-${GMOCK_VERSION}/include
-                  ${PROJECT_SOURCE_DIR}/../TestingTools/gmock-${GMOCK_VERSION}/include
+            PATHS ${PROJECT_SOURCE_DIR}/Testing/Tools/gmock-${GMOCK_VERSION}/include
+                  ${PROJECT_SOURCE_DIR}/../Testing/Tools/gmock-${GMOCK_VERSION}/include
             NO_DEFAULT_PATH )
 
 SET(GMOCK_LIB gmock)

diff --git a/Code/Mantid/Build/CMake/FindMatlab.cmake b/Code/Mantid/Build/CMake/FindMatlab.cmake
diff --git a/Code/Mantid/Build/CMake/FindPyUnitTest.cmake b/Code/Mantid/Build/CMake/FindPyUnitTest.cmake
@@ -59,13 +59,13 @@ endmacro ( PYUNITTEST_ADD_TEST )
 
 # find the driver script
 find_program ( PYUNITTEST_GEN_EXEC pyunit_gen.py
-               PATHS ${PROJECT_SOURCE_DIR}/TestingTools/pyunit_gen
-                     ${PROJECT_SOURCE_DIR}/../TestingTools/pyunit_gen )
+               PATHS ${PROJECT_SOURCE_DIR}/Testing/Tools/pyunit_gen
+                     ${PROJECT_SOURCE_DIR}/../Testing/Tools/pyunit_gen )
 
 # determine where the xmlrunner lives
 find_path ( PYUNITTEST_XMLRUNNER xmlrunner/__init__.py
-            PATHS ${PROJECT_SOURCE_DIR}/TestingTools/unittest-xml-reporting/src/
-                  ${PROJECT_SOURCE_DIR}/../TestingTools/unittest-xml-reporting/src/ )
+            PATHS ${PROJECT_SOURCE_DIR}/Testing/Tools/unittest-xml-reporting/src/
+                  ${PROJECT_SOURCE_DIR}/../Testing/Tools/unittest-xml-reporting/src/ )
 
 # let people know whether or not it was found
 if (PYUNITTEST_GEN_EXEC)

diff --git a/Code/Mantid/Build/CMake/FindPythonLibs.cmake b/Code/Mantid/Build/CMake/FindPythonLibs.cmake
diff --git a/Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in b/Code/Mantid/Build/CMake/Packaging/launch_mantidplot.sh.in
@@ -21,4 +21,4 @@ else
 fi
 
 # Launch
-LD_PRELOAD=${LOCAL_PRELOAD} TCMALLOC_RELEASE_RATE=${TCM_RELEASE} LD_LIBRARY_PATH=${LOCAL_LDPATH} @WRAPPER_PREFIX@$INSTALLDIR/@MANTIDPLOT_EXEC@ $*@WRAPPER_POSTFIX@
+LD_PRELOAD=${LOCAL_PRELOAD} TCMALLOC_RELEASE_RATE=${TCM_RELEASE} LD_LIBRARY_PATH=${LOCAL_LDPATH} QT_API=pyqt @WRAPPER_PREFIX@$INSTALLDIR/@MANTIDPLOT_EXEC@ $*@WRAPPER_POSTFIX@
diff --git a/Code/Mantid/Build/CMake/SetupDataTargets.cmake b/Code/Mantid/Build/CMake/SetupDataTargets.cmake
@@ -0,0 +1,32 @@
+###########################################################################
+# Define targets to download the data
+###########################################################################
+include ( MantidExternalData )
+
+# None of our tests reference files directly as arguments so we have to manually
+# call ExternalData_Expand_Arguments to register the files with the ExternalData
+# mechanism
+function(_create_data_target _targetname _content_link_patterns)
+  get_filename_component ( EXTERNALDATATEST_SOURCE_DIR ${PROJECT_SOURCE_DIR} ABSOLUTE )
+  foreach(_pattern ${_content_link_patterns})
+    file( GLOB_RECURSE _content_links
+      RELATIVE "${EXTERNALDATATEST_SOURCE_DIR}" ${_pattern} )
+    foreach(link ${_content_links})
+      string( REGEX REPLACE "\\.md5$" "" link ${link} )
+      ExternalData_Expand_Arguments( ${_targetname}
+        link_location
+        DATA{${link}}
+      )
+    endforeach()
+  endforeach()
+  # Create target to download data from the StandardTestData group.  This must come after
+  # all tests have been added that reference the group, so we put it last.
+  ExternalData_Add_Target(${_targetname})
+  set_target_properties(${_targetname} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+endfunction()
+
+# We'll create two targets:
+#  - StandardTestData: data required by the unit tests and documentation tests
+#  - SystemTestData: data required for the system tests
+_create_data_target(StandardTestData "Testing/Data/DocTest/*.md5;Testing/Data/UnitTest/*.md5")
+_create_data_target(SystemTestData "Testing/Data/SystemTest/*.md5;Testing/SystemTests/tests/analysis/reference/*.md5")