mantidproject · thomashampson · Mar 13, 2025 · Mar 12, 2025
diff --git a/Framework/API/test/CMakeLists.txt b/Framework/API/test/CMakeLists.txt
@@ -27,7 +27,7 @@ if(CXXTEST_FOUND)
 
   add_dependencies(FrameworkTests APITest)
   # Test data
-  add_dependencies(APITest StandardTestData)
+  add_dependencies(APITest UnitTestData)
 
   # Add to the 'FrameworkTests' group in VS
   set_property(TARGET APITest PROPERTY FOLDER "UnitTests")

diff --git a/Framework/Algorithms/test/CMakeLists.txt b/Framework/Algorithms/test/CMakeLists.txt
@@ -51,7 +51,7 @@ if(CXXTEST_FOUND)
   add_dependencies(AlgorithmsTest Crystal CurveFitting)
   add_dependencies(FrameworkTests AlgorithmsTest)
   # Test data
-  add_dependencies(AlgorithmsTest StandardTestData)
+  add_dependencies(AlgorithmsTest UnitTestData)
 
   # Add to the 'FrameworkTests' group in VS
   set_property(TARGET AlgorithmsTest PROPERTY FOLDER "UnitTests")

diff --git a/Framework/Crystal/test/CMakeLists.txt b/Framework/Crystal/test/CMakeLists.txt
@@ -15,7 +15,7 @@ if(CXXTEST_FOUND)
   add_dependencies(CrystalTest Algorithms CurveFitting)
   add_dependencies(FrameworkTests CrystalTest)
   # Test data
-  add_dependencies(CrystalTest StandardTestData)
+  add_dependencies(CrystalTest UnitTestData)
 
   # Add to the 'FrameworkTests' group in VS
   set_property(TARGET CrystalTest PROPERTY FOLDER "UnitTests")

diff --git a/Framework/CurveFitting/test/CMakeLists.txt b/Framework/CurveFitting/test/CMakeLists.txt
@@ -10,7 +10,7 @@ if(CXXTEST_FOUND)
   add_dependencies(CurveFittingTest Algorithms)
   add_dependencies(FrameworkTests CurveFittingTest)
   # Test data
-  add_dependencies(CurveFittingTest StandardTestData)
+  add_dependencies(CurveFittingTest UnitTestData)
 
   # Add to the 'FrameworkTests' group in VS
   set_property(TARGET CurveFittingTest PROPERTY FOLDER "UnitTests")

diff --git a/Framework/DataHandling/test/CMakeLists.txt b/Framework/DataHandling/test/CMakeLists.txt
@@ -30,7 +30,7 @@ if(CXXTEST_FOUND)
   add_dependencies(DataHandlingTest Algorithms MDAlgorithms)
   add_dependencies(FrameworkTests DataHandlingTest)
   # Test data
-  add_dependencies(DataHandlingTest StandardTestData)
+  add_dependencies(DataHandlingTest UnitTestData)
 
   # Add to the 'FrameworkTests' group in VS
   set_property(TARGET DataHandlingTest PROPERTY FOLDER "UnitTests")

diff --git a/Framework/Kernel/test/CMakeLists.txt b/Framework/Kernel/test/CMakeLists.txt
@@ -9,7 +9,7 @@ if(CXXTEST_FOUND)
   add_framework_test_helpers(KernelTest)
   add_dependencies(FrameworkTests KernelTest)
   # Test data
-  add_dependencies(KernelTest StandardTestData)
+  add_dependencies(KernelTest UnitTestData)
 
   # Add to the 'FrameworkTests' group in VS
   set_property(TARGET KernelTest PROPERTY FOLDER "UnitTests")

diff --git a/Framework/LiveData/test/CMakeLists.txt b/Framework/LiveData/test/CMakeLists.txt
@@ -16,7 +16,7 @@ if(CXXTEST_FOUND)
   add_dependencies(LiveDataTest DataHandling Algorithms MDAlgorithms)
   add_dependencies(FrameworkTests LiveDataTest)
   # Test data
-  add_dependencies(LiveDataTest StandardTestData)
+  add_dependencies(LiveDataTest UnitTestData)
 
   # Add to the 'FrameworkTests' group in VS
   set_property(TARGET LiveDataTest PROPERTY FOLDER "UnitTests")

diff --git a/Framework/MDAlgorithms/test/CMakeLists.txt b/Framework/MDAlgorithms/test/CMakeLists.txt
@@ -19,7 +19,7 @@ if(CXXTEST_FOUND)
   add_framework_test_helpers(MDAlgorithmsTest)
   add_dependencies(MDAlgorithmsTest DataHandling Algorithms CurveFitting)
   add_dependencies(FrameworkTests MDAlgorithmsTest)
-  # Test data add_dependencies(MDAlgorithmsTest StandardTestData)
+  add_dependencies(MDAlgorithmsTest UnitTestData)
 
   # Add to the 'FrameworkTests' group in VS
   set_property(TARGET MDAlgorithmsTest PROPERTY FOLDER "UnitTests")

diff --git a/Framework/Muon/test/CMakeLists.txt b/Framework/Muon/test/CMakeLists.txt
@@ -13,7 +13,7 @@ if(CXXTEST_FOUND)
   add_dependencies(MuonTest Crystal CurveFitting)
   add_dependencies(FrameworkTests MuonTest)
   # Test data
-  add_dependencies(MuonTest StandardTestData)
+  add_dependencies(MuonTest UnitTestData)
 
   # Add to the 'MuonTest' group in VS
   set_property(TARGET MuonTest PROPERTY FOLDER "UnitTests")

diff --git a/Framework/Nexus/test/CMakeLists.txt b/Framework/Nexus/test/CMakeLists.txt
@@ -6,7 +6,6 @@ if(CXXTEST_FOUND)
   target_link_libraries(NexusTest PRIVATE Mantid::API Mantid::Nexus gmock)
   add_framework_test_helpers(NexusTest)
   add_dependencies(FrameworkTests NexusTest)
-  add_dependencies(NexusTest StandardTestData)
   # Add to the 'FrameworkTests' group in VS
   set_property(TARGET NexusTest PROPERTY FOLDER "UnitTests")
 endif()

diff --git a/Framework/NexusGeometry/test/CMakeLists.txt b/Framework/NexusGeometry/test/CMakeLists.txt
@@ -12,7 +12,7 @@ if(CXXTEST_FOUND)
   add_framework_test_helpers(NexusGeometryTest)
   add_dependencies(NexusGeometryTest Geometry)
   add_dependencies(FrameworkTests NexusGeometryTest)
-  add_dependencies(NexusGeometryTest StandardTestData)
+  add_dependencies(NexusGeometryTest UnitTestData)
   # Add to the 'FrameworkTests' group in VS
   set_property(TARGET NexusGeometryTest PROPERTY FOLDER "UnitTests")
 endif()
diff --git a/Framework/Reflectometry/test/CMakeLists.txt b/Framework/Reflectometry/test/CMakeLists.txt
@@ -36,7 +36,7 @@ if(CXXTEST_FOUND)
 
   add_dependencies(FrameworkTests ReflectometryTest)
   # Test data
-  add_dependencies(ReflectometryTest StandardTestData)
+  add_dependencies(ReflectometryTest UnitTestData)
   add_framework_test_helpers(ReflectometryTest)
 
   # Add to the 'ReflectometryTest' group in VS

diff --git a/Framework/SINQ/test/CMakeLists.txt b/Framework/SINQ/test/CMakeLists.txt
@@ -13,7 +13,7 @@ if(CXXTEST_FOUND)
   add_framework_test_helpers(PSISINQTest)
 
   # Test data
-  add_dependencies(PSISINQTest StandardTestData)
+  add_dependencies(PSISINQTest UnitTestData)
 
   add_dependencies(FrameworkTests PSISINQTest)
   # Add to the 'FrameworkTests' group in VS

diff --git a/Framework/WorkflowAlgorithms/test/CMakeLists.txt b/Framework/WorkflowAlgorithms/test/CMakeLists.txt
@@ -24,7 +24,7 @@ if(CXXTEST_FOUND)
   add_dependencies(WorkflowAlgorithmsTest CurveFitting)
   add_dependencies(FrameworkTests WorkflowAlgorithmsTest)
   # Test data
-  add_dependencies(WorkflowAlgorithmsTest StandardTestData)
+  add_dependencies(WorkflowAlgorithmsTest UnitTestData)
   add_framework_test_helpers(WorkflowAlgorithmsTest)
 
   # Add to the 'FrameworkTests' group in VS

diff --git a/buildconfig/CMake/SetupDataTargets.cmake b/buildconfig/CMake/SetupDataTargets.cmake
@@ -24,7 +24,11 @@ function(_create_data_target _targetname _content_link_patterns)
   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")
+# We'll create three targets: - StandardTestData: includes both data required by the unit tests and documentation tests
+# - broken down into UnitTestData and DocTestData SystemTestData: data required for the system tests
+_create_data_target(UnitTestData "Testing/Data/UnitTest/*.md5")
+_create_data_target(DocTestData "Testing/Data/DocTest/*.md5")
 _create_data_target(SystemTestData "Testing/Data/SystemTest/*.md5;Testing/SystemTests/tests/framework/reference/*.md5")
+# Combine individual targets
+add_custom_target(StandardTestData DEPENDS UnitTestData DocTestData)
+set_target_properties(StandardTestData PROPERTIES EXCLUDE_FROM_ALL TRUE)
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -110,6 +110,7 @@ endfunction()
 # Documentation types
 add_sphinx_build_target(html "sphinx.ext.mathjax")
 add_sphinx_build_target(doctest "sphinx.ext.mathjax")
+add_dependencies(docs-doctest DocTestData)
 
 # qthelp if building workbench
 if(DOCS_QTHELP)