diff --git a/CMakeLists.txt b/CMakeLists.txt index ce0481b8f53c8408974eee314950fe7ba4347307..14839c35ece36ec8f9541f65b4a36f2dfa599862 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ if (ENABLE_MANTIDPLOT) # Add a target for all GUI tests add_custom_target ( GUITests ) add_dependencies ( GUITests MantidWidgetsTest) - add_dependencies ( mantid-check GUITests ) + add_dependencies ( check GUITests ) # Collect all tests together add_custom_target ( AllTests ) add_dependencies ( AllTests FrameworkTests GUITests ) diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt index f6e5cc40adc27f3fe7591d3f263dc9e653b85a66..e2a5e03d7a852c1b4b6b97dfe1a5b7629c8019ff 100644 --- a/Framework/CMakeLists.txt +++ b/Framework/CMakeLists.txt @@ -62,7 +62,7 @@ endif () ########################################################################### add_custom_target ( FrameworkTests ) # target for all framework tests -add_dependencies ( mantid-check FrameworkTests ) +add_dependencies ( check FrameworkTests ) include_directories (Kernel/inc) add_subdirectory (Kernel) diff --git a/buildconfig/CMake/CommonSetup.cmake b/buildconfig/CMake/CommonSetup.cmake index 90d6913a94a3532d83eb803438c6b14a77b54113..3ee919cc85b00334bba69875b68cc8981179e8a9 100644 --- a/buildconfig/CMake/CommonSetup.cmake +++ b/buildconfig/CMake/CommonSetup.cmake @@ -267,9 +267,9 @@ include ( PylintSetup ) find_package ( CxxTest ) if ( CXXTEST_FOUND ) enable_testing () - add_custom_target( mantid-check COMMAND ${CMAKE_CTEST_COMMAND} ) + add_custom_target( check COMMAND ${CMAKE_CTEST_COMMAND} ) make_directory( ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Testing ) - message ( STATUS "Added target ('mantid-check') for unit tests" ) + message ( STATUS "Added target ('check') for unit tests" ) else () message ( STATUS "Could NOT find CxxTest - unit testing not available" ) endif () diff --git a/buildconfig/CMake/FindCxxTest.cmake b/buildconfig/CMake/FindCxxTest.cmake index f8f79ad385d5dec71593fd33b41929cb575bb240..8aaeadbb37fdf2ffe70d2321f172fcbfd2a36c31 100644 --- a/buildconfig/CMake/FindCxxTest.cmake +++ b/buildconfig/CMake/FindCxxTest.cmake @@ -141,8 +141,8 @@ macro(CXXTEST_ADD_TEST _cxxtest_testname) # The TESTHELPER_SRCS variable can be set outside the macro and used to pass in test helper classes add_executable(${_cxxtest_testname} EXCLUDE_FROM_ALL ${_cxxtest_cpp_files} ${_cxxtest_h_files} ${TESTHELPER_SRCS} ) - # only the package wide test is added to mantid-check - add_dependencies(mantid-check ${_cxxtest_testname}) + # only the package wide test is added to check + add_dependencies(check ${_cxxtest_testname}) if (CXXTEST_SINGLE_LOGFILE) # add the whole suite as a single test so the output xml doesn't overwrite itself