From 9de61cf0b10a0d2ec47ea9a95a2e4ae88eedf9b4 Mon Sep 17 00:00:00 2001
From: Ian Bush <bush@ill.fr>
Date: Thu, 2 Feb 2017 15:25:25 +0100
Subject: [PATCH] Refs #18540 Reverted mantid-check back to checl
---
CMakeLists.txt | 2 +-
Framework/CMakeLists.txt | 2 +-
buildconfig/CMake/CommonSetup.cmake | 4 ++--
buildconfig/CMake/FindCxxTest.cmake | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce0481b8f53..14839c35ece 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 f6e5cc40adc..e2a5e03d7a8 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 90d6913a94a..3ee919cc85b 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 f8f79ad385d..8aaeadbb37f 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
--
GitLab