diff options
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/Cuda/CMakeLists.txt | 41 | ||||
-rw-r--r-- | Tests/CudaOnly/CMakeLists.txt | 39 | ||||
-rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 10 |
4 files changed, 61 insertions, 33 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index d7e567c..b771ff5 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -450,6 +450,8 @@ if(BUILD_TESTING) -DCMake_TEST_CUDA:BOOL=${CMake_TEST_CUDA} ) ADD_TEST_MACRO(ExportImport ExportImport) + set_property(TEST ExportImport APPEND + PROPERTY LABELS "CUDA") ADD_TEST_MACRO(Unset Unset) ADD_TEST_MACRO(PolicyScope PolicyScope) ADD_TEST_MACRO(EmptyLibrary EmptyLibrary) @@ -1896,6 +1898,8 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH endif() set(MSVCRuntimeLibrary_BUILD_OPTIONS -DCMake_TEST_CUDA=${CMake_TEST_CUDA}) ADD_TEST_MACRO(MSVCRuntimeLibrary) + set_property(TEST MSVCRuntimeLibrary APPEND + PROPERTY LABELS "CUDA") if(CMAKE_Fortran_COMPILER) ADD_TEST_MACRO(MSVCRuntimeLibrary.Fortran) endif() diff --git a/Tests/Cuda/CMakeLists.txt b/Tests/Cuda/CMakeLists.txt index 630cea2..35ceb33 100644 --- a/Tests/Cuda/CMakeLists.txt +++ b/Tests/Cuda/CMakeLists.txt @@ -1,30 +1,35 @@ +macro (add_cuda_test_macro name) + add_test_macro("${name}" ${ARGN}) + set_property(TEST "${name}" APPEND + PROPERTY LABELS "CUDA") +endmacro () -ADD_TEST_MACRO(Cuda.ConsumeCompileFeatures CudaConsumeCompileFeatures) -ADD_TEST_MACRO(Cuda.CXXStandardSetTwice CXXStandardSetTwice) -ADD_TEST_MACRO(Cuda.ObjectLibrary CudaObjectLibrary) -ADD_TEST_MACRO(Cuda.MixedStandardLevels1 MixedStandardLevels1) -ADD_TEST_MACRO(Cuda.MixedStandardLevels2 MixedStandardLevels2) -ADD_TEST_MACRO(Cuda.MixedStandardLevels3 MixedStandardLevels3) -ADD_TEST_MACRO(Cuda.MixedStandardLevels4 MixedStandardLevels4) -ADD_TEST_MACRO(Cuda.MixedStandardLevels5 MixedStandardLevels5) -ADD_TEST_MACRO(Cuda.NotEnabled CudaNotEnabled) -ADD_TEST_MACRO(Cuda.SeparableCompCXXOnly SeparableCompCXXOnly) -ADD_TEST_MACRO(Cuda.Toolkit Toolkit) -ADD_TEST_MACRO(Cuda.IncludePathNoToolkit IncludePathNoToolkit) -ADD_TEST_MACRO(Cuda.SharedRuntimePlusToolkit SharedRuntimePlusToolkit) +add_cuda_test_macro(Cuda.ConsumeCompileFeatures CudaConsumeCompileFeatures) +add_cuda_test_macro(Cuda.CXXStandardSetTwice CXXStandardSetTwice) +add_cuda_test_macro(Cuda.ObjectLibrary CudaObjectLibrary) +add_cuda_test_macro(Cuda.MixedStandardLevels1 MixedStandardLevels1) +add_cuda_test_macro(Cuda.MixedStandardLevels2 MixedStandardLevels2) +add_cuda_test_macro(Cuda.MixedStandardLevels3 MixedStandardLevels3) +add_cuda_test_macro(Cuda.MixedStandardLevels4 MixedStandardLevels4) +add_cuda_test_macro(Cuda.MixedStandardLevels5 MixedStandardLevels5) +add_cuda_test_macro(Cuda.NotEnabled CudaNotEnabled) +add_cuda_test_macro(Cuda.SeparableCompCXXOnly SeparableCompCXXOnly) +add_cuda_test_macro(Cuda.Toolkit Toolkit) +add_cuda_test_macro(Cuda.IncludePathNoToolkit IncludePathNoToolkit) +add_cuda_test_macro(Cuda.SharedRuntimePlusToolkit SharedRuntimePlusToolkit) # Separable compilation is currently only supported on NVCC. Disable tests # using it for other compilers. if(CMake_TEST_CUDA AND NOT CMake_TEST_CUDA STREQUAL "Clang") - ADD_TEST_MACRO(Cuda.Complex CudaComplex) - ADD_TEST_MACRO(Cuda.ProperDeviceLibraries ProperDeviceLibraries) - ADD_TEST_MACRO(Cuda.ProperLinkFlags ProperLinkFlags) + add_cuda_test_macro(Cuda.Complex CudaComplex) + add_cuda_test_macro(Cuda.ProperDeviceLibraries ProperDeviceLibraries) + add_cuda_test_macro(Cuda.ProperLinkFlags ProperLinkFlags) endif() # The CUDA only ships the shared version of the toolkit libraries # on windows if(NOT WIN32) - ADD_TEST_MACRO(Cuda.StaticRuntimePlusToolkit StaticRuntimePlusToolkit) + add_cuda_test_macro(Cuda.StaticRuntimePlusToolkit StaticRuntimePlusToolkit) endif() -ADD_TEST_MACRO(Cuda.WithC CudaWithC) +add_cuda_test_macro(Cuda.WithC CudaWithC) diff --git a/Tests/CudaOnly/CMakeLists.txt b/Tests/CudaOnly/CMakeLists.txt index 8244b91..7376a73 100644 --- a/Tests/CudaOnly/CMakeLists.txt +++ b/Tests/CudaOnly/CMakeLists.txt @@ -1,21 +1,26 @@ +macro (add_cuda_test_macro name) + add_test_macro("${name}" ${ARGN}) + set_property(TEST "${name}" APPEND + PROPERTY LABELS "CUDA") +endmacro () -ADD_TEST_MACRO(CudaOnly.Architecture Architecture) -ADD_TEST_MACRO(CudaOnly.CompileFlags CudaOnlyCompileFlags) -ADD_TEST_MACRO(CudaOnly.EnableStandard CudaOnlyEnableStandard) -ADD_TEST_MACRO(CudaOnly.ExportPTX CudaOnlyExportPTX) -ADD_TEST_MACRO(CudaOnly.SharedRuntimePlusToolkit CudaOnlySharedRuntimePlusToolkit) -ADD_TEST_MACRO(CudaOnly.Standard98 CudaOnlyStandard98) -ADD_TEST_MACRO(CudaOnly.Toolkit CudaOnlyToolkit) -ADD_TEST_MACRO(CudaOnly.WithDefs CudaOnlyWithDefs) +add_cuda_test_macro(CudaOnly.Architecture Architecture) +add_cuda_test_macro(CudaOnly.CompileFlags CudaOnlyCompileFlags) +add_cuda_test_macro(CudaOnly.EnableStandard CudaOnlyEnableStandard) +add_cuda_test_macro(CudaOnly.ExportPTX CudaOnlyExportPTX) +add_cuda_test_macro(CudaOnly.SharedRuntimePlusToolkit CudaOnlySharedRuntimePlusToolkit) +add_cuda_test_macro(CudaOnly.Standard98 CudaOnlyStandard98) +add_cuda_test_macro(CudaOnly.Toolkit CudaOnlyToolkit) +add_cuda_test_macro(CudaOnly.WithDefs CudaOnlyWithDefs) if(CMake_TEST_CUDA AND NOT CMake_TEST_CUDA STREQUAL "Clang") - ADD_TEST_MACRO(CudaOnly.SharedRuntimeViaCUDAFlags CudaOnlySharedRuntimeViaCUDAFlags) + add_cuda_test_macro(CudaOnly.SharedRuntimeViaCUDAFlags CudaOnlySharedRuntimeViaCUDAFlags) # Separable compilation is currently only supported on NVCC. Disable tests # using it for other compilers. - ADD_TEST_MACRO(CudaOnly.CircularLinkLine CudaOnlyCircularLinkLine) - ADD_TEST_MACRO(CudaOnly.ResolveDeviceSymbols CudaOnlyResolveDeviceSymbols) - ADD_TEST_MACRO(CudaOnly.SeparateCompilation CudaOnlySeparateCompilation) + add_cuda_test_macro(CudaOnly.CircularLinkLine CudaOnlyCircularLinkLine) + add_cuda_test_macro(CudaOnly.ResolveDeviceSymbols CudaOnlyResolveDeviceSymbols) + add_cuda_test_macro(CudaOnly.SeparateCompilation CudaOnlySeparateCompilation) add_test(NAME CudaOnly.DontResolveDeviceSymbols COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION> @@ -27,19 +32,21 @@ if(CMake_TEST_CUDA AND NOT CMake_TEST_CUDA STREQUAL "Clang") --build-options ${build_options} --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION> ) + set_property(TEST "CudaOnly.DontResolveDeviceSymbols" APPEND + PROPERTY LABELS "CUDA") # Only NVCC defines __CUDACC_DEBUG__ when compiling in debug mode. - ADD_TEST_MACRO(CudaOnly.GPUDebugFlag CudaOnlyGPUDebugFlag) + add_cuda_test_macro(CudaOnly.GPUDebugFlag CudaOnlyGPUDebugFlag) endif() # The CUDA only ships the shared version of the toolkit libraries # on windows if(NOT WIN32) - ADD_TEST_MACRO(Cuda.StaticRuntimePlusToolkit StaticRuntimePlusToolkit) + add_cuda_test_macro(CudaOnly.StaticRuntimePlusToolkit CudaOnlyStaticRuntimePlusToolkit) endif() if(MSVC) - ADD_TEST_MACRO(CudaOnly.PDB CudaOnlyPDB) + add_cuda_test_macro(CudaOnly.PDB CudaOnlyPDB) endif() add_test(NAME CudaOnly.RuntimeControls COMMAND @@ -53,3 +60,5 @@ add_test(NAME CudaOnly.RuntimeControls COMMAND --build-options ${build_options} --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION> ) +set_property(TEST "CudaOnly.RuntimeControls" APPEND + PROPERTY LABELS "CUDA") diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 65d5e44..8bb1f27 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -118,6 +118,8 @@ add_RunCMake_test(CMP0081) add_RunCMake_test(CMP0102) if(CMake_TEST_CUDA) add_RunCMake_test(CMP0104) + set_property(TEST RunCMake.CMP0104 APPEND + PROPERTY LABELS "CUDA") endif() add_RunCMake_test(CMP0106) @@ -149,6 +151,8 @@ if(CMAKE_GENERATOR MATCHES "Ninja") list(APPEND NinjaMultiConfig_ARGS -DCMake_TEST_CUDA=${CMake_TEST_CUDA}) endif() add_RunCMake_test(NinjaMultiConfig) + set_property(TEST RunCMake.NinjaMultiConfig APPEND + PROPERTY LABELS "CUDA") endif() add_RunCMake_test(CTest) @@ -365,6 +369,8 @@ function(add_RunCMake_test_try_compile) endif() endforeach() add_RunCMake_test(try_compile) + set_property(TEST RunCMake.try_compile APPEND + PROPERTY LABELS "CUDA") endfunction() add_RunCMake_test_try_compile() @@ -481,6 +487,8 @@ add_RunCMake_test(target_link_libraries) add_RunCMake_test(add_link_options -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID}) add_RunCMake_test(target_link_options -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID} -DCMake_TEST_CUDA=${CMake_TEST_CUDA}) +set_property(TEST RunCMake.target_link_options APPEND + PROPERTY LABELS "CUDA") add_RunCMake_test(target_compile_definitions) add_RunCMake_test(target_compile_features) @@ -590,6 +598,8 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja") list(APPEND CompilerLauncher_ARGS -DCMake_TEST_OBJC=1) endif() add_RunCMake_test(CompilerLauncher) + set_property(TEST RunCMake.CompilerLauncher APPEND + PROPERTY LABELS "CUDA") add_RunCMake_test(ctest_labels_for_subprojects) endif() |