Refs #4316: Added AllTests target

that includes GUITests and FrameworkTests. Moved MantidQtAPI test to GUITests.
mantidproject · Dec 13, 2011 · 7bfe4c5 · 7bfe4c5
1 parent 643e27c
commit 7bfe4c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
@@ -84,6 +84,12 @@ if (PYUNITTEST_FOUND)
   add_subdirectory ( scripts )
 endif ()
 
+# Collect all tests together
+add_custom_target ( AllTests ) 
+add_dependencies ( AllTests FrameworkTests )
+add_dependencies ( AllTests GUITests )
+
+
 ###########################################################################
 # Installation settings
 ###########################################################################

diff --git a/Code/Mantid/MantidQt/API/CMakeLists.txt b/Code/Mantid/MantidQt/API/CMakeLists.txt
@@ -85,7 +85,7 @@ if ( CXXTEST_FOUND )
   if ( GMOCK_FOUND AND GTEST_FOUND )
     cxxtest_add_test ( MantidQtAPITest ${TEST_FILES} ${GMOCK_TEST_FILES} )
     target_link_libraries( MantidQtAPITest MantidQtAPI ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} )
-    add_dependencies( FrameworkTests MantidQtAPITest )
+    add_dependencies( GUITests MantidQtAPITest )
     # Add to the 'UnitTests' group in VS
     set_property( TARGET MantidQtAPITest PROPERTY FOLDER "UnitTests" )
   endif ()