Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
74620f29
Unverified
Commit
74620f29
authored
Mar 23, 2020
by
Gigg, Martyn Anthony
Committed by
GitHub
Mar 23, 2020
Browse files
Merge pull request #28249 from mantidproject/26260_Update_google_test
Update google test / span
parents
05ae26bf
715a9140
Changes
41
Hide whitespace changes
Inline
Side-by-side
Framework/API/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
include_directories
(
../../TestHelpers/inc ../../Nexus/inc
${
HDF5_INCLUDE_DIRS
}
)
...
...
@@ -32,8 +31,8 @@ if(CXXTEST_FOUND)
${
JSONCPP_LIBRARIES
}
${
NEXUS_LIBRARIES
}
${
MUPARSER_LIBRARIES
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
FrameworkTests APITest
)
# Test data
...
...
Framework/Algorithms/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
check_include_files
(
stdint.h stdint
)
if
(
stdint
)
add_definitions
(
-DHAVE_STDINT_H
)
...
...
@@ -60,8 +59,8 @@ if(CXXTEST_FOUND)
DataHandling
Nexus
${
BCRYPT
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
AlgorithmsTest Crystal CurveFitting
)
add_dependencies
(
FrameworkTests AlgorithmsTest
)
# Test data
...
...
Framework/Beamline/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
../../TestHelpers/inc
)
cxxtest_add_test
(
BeamlineTest
${
TEST_FILES
}
${
GMOCK_TEST_FILES
}
)
...
...
@@ -12,8 +10,8 @@ if(CXXTEST_FOUND)
${
TCMALLOC_LIBRARIES_LINKTIME
}
Beamline
${
Boost_LIBRARIES
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
FrameworkTests BeamlineTest
)
# Add to the 'FrameworkTests' group in VS
...
...
Framework/Crystal/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
include_directories
(
../../DataHandling/inc ../../TestHelpers/inc
)
# This variable is used within the cxxtest_add_test macro to build these
...
...
@@ -23,8 +22,8 @@ if(CXXTEST_FOUND)
DataHandling
MDAlgorithms
Nexus
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
CrystalTest Algorithms CurveFitting
)
add_dependencies
(
FrameworkTests CrystalTest
)
# Test data
...
...
Framework/CurveFitting/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
include_directories
(
../../DataHandling/inc ../../TestHelpers/inc
)
# This variable is used within the cxxtest_add_test macro to build these
...
...
@@ -24,8 +23,8 @@ if(CXXTEST_FOUND)
CurveFitting
DataHandling
${
GSL_LIBRARIES
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
CurveFittingTest Algorithms
)
add_dependencies
(
FrameworkTests CurveFittingTest
)
# Test data
...
...
Framework/DataObjects/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
include_directories
(
../../TestHelpers/inc
)
# This variable is used within the cxxtest_add_test macro to build this helper
...
...
@@ -28,8 +27,8 @@ if(CXXTEST_FOUND)
DataObjects
${
NEXUS_LIBRARIES
}
${
JSONCPP_LIBRARIES
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
# Specify implicit dependency, but don't link to it
add_dependencies
(
FrameworkTests DataObjectsTest
)
# Add to the 'FrameworkTests' group in VS
...
...
Framework/Geometry/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
# This is required to pick up ComponentCreationHelper, which is the only
# TestHelpers class that may be used by Geometry tests (as it does not depend
...
...
@@ -30,8 +29,8 @@ if(CXXTEST_FOUND)
${
GSL_LIBRARIES
}
${
Boost_LIBRARIES
}
${
POCO_LIBRARIES
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
FrameworkTests GeometryTest
)
# Add to the 'FrameworkTests' group in VS
...
...
Framework/HistogramData/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
../../TestHelpers/inc
)
cxxtest_add_test
(
HistogramDataTest
${
TEST_FILES
}
${
GMOCK_TEST_FILES
}
)
...
...
@@ -13,8 +11,8 @@ if(CXXTEST_FOUND)
${
TCMALLOC_LIBRARIES_LINKTIME
}
HistogramData
${
Boost_LIBRARIES
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
FrameworkTests HistogramDataTest
)
# Add to the 'FrameworkTests' group in VS
...
...
Framework/Indexing/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
include_directories
(
../../TestHelpers/inc
)
# This variable is used within the cxxtest_add_test macro to build these
# helper classes into the test executable. It will go out of scope at the end
...
...
@@ -16,8 +15,8 @@ if(CXXTEST_FOUND)
${
MANTIDLIBS
}
Indexing
Parallel
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
FrameworkTests IndexingTest
)
# Add to the 'FrameworkTests' group in VS
...
...
Framework/Kernel/CMakeLists.txt
View file @
74620f29
...
...
@@ -491,7 +491,7 @@ target_include_directories(Kernel SYSTEM
PUBLIC
${
Boost_INCLUDE_DIRS
}
${
POCO_INCLUDE_DIRS
}
${
JSONCPP_INCLUDE_DIR
}
PRIVATE
${
NEXUS_INCLUDE_DIR
}
${
GSL_INCLUDE_DIR
}
${
OPENSSL_INCLUDE_DIR
}
${
SPAN_INCLUDE_DIR
}
)
${
OPENSSL_INCLUDE_DIR
}
)
if
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Darwin"
)
set_target_properties
(
Kernel PROPERTIES INSTALL_RPATH
"@loader_path/../MacOS;@loader_path/../Frameworks"
)
...
...
@@ -519,7 +519,9 @@ target_link_libraries(Kernel
${
TCMALLOC_LIBRARIES_LINKTIME
}
${
GSL_LIBRARIES
}
${
MANTIDLIBS
}
${
NETWORK_LIBRARIES
}
)
${
NETWORK_LIBRARIES
}
span
)
if
(
WIN32
)
target_link_libraries
(
Kernel LINK_PRIVATE Psapi.lib
)
# For memory usage
# queries
...
...
Framework/Kernel/test/CMakeLists.txt
View file @
74620f29
...
...
@@ -11,8 +11,6 @@ if(CXXTEST_FOUND)
cxxtest_add_test
(
KernelTest
${
TEST_FILES
}
)
target_include_directories
(
KernelTest SYSTEM PRIVATE
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
../../TestHelpers/inc
)
target_link_libraries
(
KernelTest
PRIVATE
...
...
@@ -22,8 +20,7 @@ if(CXXTEST_FOUND)
${
NEXUS_LIBRARIES
}
${
Boost_LIBRARIES
}
${
POCO_LIBRARIES
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
gmock
${
JSONCPP_LIBRARIES
}
${
TBB_LIBRARIES
}
${
TBB_MALLOC_LIBRARIES
}
)
...
...
Framework/LiveData/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
include_directories
(
../../TestHelpers/inc
)
# This variable is used within the cxxtest_add_test macro to build this helper
...
...
@@ -24,7 +23,7 @@ if(CXXTEST_FOUND)
${
TCMALLOC_LIBRARIES_LINKTIME
}
${
MANTIDLIBS
}
LiveData
${
GMOCK_LIBRARIES
}
)
gmock
)
target_include_directories
(
LiveDataTest PRIVATE ../src/
)
add_dependencies
(
LiveDataTest DataHandling Algorithms MDAlgorithms
)
add_dependencies
(
FrameworkTests LiveDataTest
)
...
...
Framework/MDAlgorithms/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
${
HDF5_INCLUDE_DIRS
}
)
include_directories
(
../../TestHelpers/inc ../../DataHandling/inc
...
...
@@ -31,8 +29,7 @@ if(CXXTEST_FOUND)
MDAlgorithms
Nexus
${
MUPARSER_LIBRARIES
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
gmock
${
NEXUS_LIBRARIES
}
${
HDF5_LIBRARIES
}
)
...
...
Framework/Muon/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
check_include_files
(
stdint.h stdint
)
if
(
stdint
)
add_definitions
(
-DHAVE_STDINT_H
)
...
...
@@ -40,8 +39,8 @@ if(CXXTEST_FOUND)
DataHandling
Muon
Nexus
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
MuonTest Crystal CurveFitting
)
add_dependencies
(
FrameworkTests MuonTest
)
# Test data
...
...
Framework/NexusGeometry/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
${
Boost_INCLUDE_DIRS
}
../../TestHelpers/inc
)
...
...
@@ -28,7 +26,7 @@ if(CXXTEST_FOUND)
${
NEXUS_LIBRARIES
}
${
HDF5_LIBRARIES
}
${
HDF5_HL_LIBRARIES
}
${
GMOCK_LIBRARIES
}
)
gmock
)
add_dependencies
(
NexusGeometryTest Geometry
)
add_dependencies
(
FrameworkTests NexusGeometryTest
)
add_dependencies
(
NexusGeometryTest StandardTestData
)
...
...
Framework/Parallel/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
../../TestHelpers/inc
)
# This variable is used within the cxxtest_add_test macro to build these
...
...
@@ -17,8 +15,7 @@ if(CXXTEST_FOUND)
${
TCMALLOC_LIBRARIES_LINKTIME
}
${
MANTIDLIBS
}
Parallel
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
gmock
${
HDF5_LIBRARIES
}
)
add_dependencies
(
FrameworkTests ParallelTest
)
...
...
Framework/RemoteAlgorithms/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
cxxtest_add_test
(
RemoteAlgorithmsTest
${
TEST_FILES
}
)
target_link_libraries
(
RemoteAlgorithmsTest
...
...
@@ -14,8 +13,8 @@ if(CXXTEST_FOUND)
RemoteAlgorithms
${
Boost_LIBRARIES
}
${
POCO_LIBRARIES
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
FrameworkTests RemoteAlgorithmsTest
)
# Test data. Not using any for now. Remember to uncomment if data is added for
# these remote alg. tests add_dependencies ( RemoteAlgorithmsTest
...
...
Framework/RemoteJobManagers/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
cxxtest_add_test
(
RemoteJobManagersTest
${
TEST_FILES
}
)
target_link_libraries
(
RemoteJobManagersTest
...
...
@@ -14,8 +13,8 @@ if(CXXTEST_FOUND)
RemoteJobManagers
${
Boost_LIBRARIES
}
${
POCO_LIBRARIES
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
FrameworkTests RemoteJobManagersTest
)
# Test data. Not using any for now. Remember to uncomment if data is added for
# these remote job managers add_dependencies ( RemoteJobManagersTest
...
...
Framework/SINQ/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
include_directories
(
../../CurveFitting/inc
../../MDAlgorithms/inc
...
...
@@ -26,8 +25,8 @@ if(CXXTEST_FOUND)
SINQ
CurveFitting
${
MANTIDLIBS
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
# Test data
add_dependencies
(
PSISINQTest StandardTestData
)
...
...
Framework/ScriptRepository/test/CMakeLists.txt
View file @
74620f29
if
(
CXXTEST_FOUND
)
include_directories
(
SYSTEM
${
CXXTEST_INCLUDE_DIR
}
${
GMOCK_INCLUDE_DIR
}
${
GTEST_INCLUDE_DIR
}
)
)
include_directories
(
../../ScriptRepository/inc
)
include_directories
(
../
)
...
...
@@ -17,8 +16,8 @@ if(CXXTEST_FOUND)
ScriptRepository
${
Boost_LIBRARIES
}
${
POCO_LIBRARIES
}
${
GMOCK_LIBRARIES
}
${
GTEST_LIBRARIES
}
)
gmock
)
add_dependencies
(
FrameworkTests ScriptRepositoryTest
)
# Add to the 'FrameworkTests' group in VS
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
