[test-suite] Organize build targets for CUDA tests.

[tra]

Summary

Now target hierarchy looks like this:

cuda-tests-all:

cuda-tests-simple:
  cuda-tests-simple-{variant}:
     <test name>-{variant}
cuda-tests-thrust:
  cuda-tests-thrust-{variant}:
     <test name>-{variant}

test-suite/trunk/External/CUDA/CMakeLists.txt

macro(create_one_thrust_test TestSource)
   llvm_test_run(--verbose ${_ExtraThrustTestArgs})
   llvm_test_executable(${_executable} ${TestSource} TARGET_VAR _target)
   target_link_libraries(${_target} ${VariantLibs})
   target_compile_options(${_target} PUBLIC ${THRUST_CPPFLAGS})
   list(APPEND THRUST_VARIANT_TESTS ${_target})
 endmacro()
 
 function(create_thrust_tests VariantSuffix)
-  set(_ThrustMainTarget thrust-${VariantSuffix})
+  set(_ThrustMainTarget cuda-tests-thrust-${VariantSuffix})
   if(LARGE_PROBLEM_SIZE)
     set(_ExtraThrustTestArgs "--sizes=large")
   endif()
   if(THRUST_SPLIT_TESTS)
     # test framework is common for all tests, so we build it once as a
     # library.
     add_library(ThrustTestFrameworkLib-${VariantSuffix} STATIC ${ThrustTestFramework})
     append_compile_flags(ThrustTestFrameworkLib-${VariantSuffix} ${CPPFLAGS} ${THRUST_CPPFLAGS})
else()
     # overhead, so it's actually way slower than running all tests
     # sequentially.
     llvm_test_run(--verbose ${_ExtraThrustTestArgs})
     llvm_test_executable(${_ThrustMainTarget} ${ThrustTestFramework} ${ThrustAllTestSources}
                          TARGET_VAR _target)
     target_compile_options(${_target} PUBLIC ${THRUST_CPPFLAGS})
     target_link_libraries(${_target} ${VariantLibs})
   endif()
+  add_dependencies(cuda-tests-thrust ${_ThrustMainTarget})
   list(APPEND VARIANT_CUDA_TESTS ${_ThrustMainTarget})
   set(VARIANT_CUDA_TESTS ${VARIANT_CUDA_TESTS} PARENT_SCOPE)
 endfunction()
 
 # Create set of tests for a given {CUDA,C++ standard,C++ library} tuple.
 # Sets VARIANT_CUDA_TESTS targets in parent's scope.
 function(create_cuda_test_variant VariantSuffix)
   message(STATUS "Creating CUDA test variant ${VariantSuffix}")
if (EXISTS ${_path_to_libcxx})
     set_property(TARGET libcxx PROPERTY IMPORTED_LOCATION ${_path_to_libcxx})
     set(HAVE_LIBCXX 1)
   else()
     message(WARNING "Can't find libcxx location.")
   endif()
 
   if(EXISTS "${TEST_SUITE_CUDA_ROOT}/thrust")
     message(STATUS "Found Thrust ${THRUST_PATH}")
+    add_custom_target(cuda-tests-thrust COMMENT "All thrust tests.")
     if(THRUST_SPLIT_TESTS)
       message(WARNING
   "############################################################\n"
   "Split tests for thrust will take a while to generate...     \n"
   "############################################################\n")
     endif()
     set(THRUST_PATH "${TEST_SUITE_CUDA_ROOT}/thrust" CACHE
       PATH "Thrust library path")
foreach(_Std IN ITEMS "c++98" "c++11")
         get_version(_GccVersion ${_GccPath})
         set(_Gcc_Suffix "libstdc++-${_GccVersion}")
         # Tell clang to use libstdc++ and where to find it.
         set(_Stdlib_CPPFLAGS -stdlib=libstdc++ -gcc-toolchain ${_GccPath})
         set(_Stdlib_LDFLAGS  -stdlib=libstdc++)
         # Add libstdc++ as link dependency.
         set(_Stdlib_Libs libstdcxx-${_GccVersion})
 
-        set(VARIANT_CUDA_TESTS)
         create_cuda_test_variant("${_Cuda_Suffix}-${_Std_Suffix}-${_Gcc_Suffix}")
-        list(APPEND ALL_CUDA_TESTS ${VARIANT_CUDA_TESTS})
       endforeach()
 
       if (HAVE_LIBCXX)
   # Same as above, but for libc++
   # Tell clang to use libc++
   # We also need to add compiler's include path for cxxabi.h
   get_filename_component(_compiler_path ${CMAKE_CXX_COMPILER} DIRECTORY)
   set(_Stdlib_CPPFLAGS -stdlib=libc++ -I${_compiler_path}/../include)
   set(_Stdlib_LDFLAGS  -stdlib=libc++)
   set(_Stdlib_Libs libcxx)
-  set(VARIANT_CUDA_TESTS)
   create_cuda_test_variant("${_Cuda_Suffix}-${_Std_Suffix}-libc++")
-  list(APPEND ALL_CUDA_TESTS ${VARIANT_CUDA_TESTS})
       endif()
     endforeach()
   endforeach()
 
   # convenience target to build all CUDA tests.
-  add_custom_target(cuda-tests-all DEPENDS ${ALL_CUDA_TESTS}
+  add_custom_target(cuda-tests-all DEPENDS cuda-tests-simple cuda-tests-thrust
     COMMENT "Build all CUDA tests.")
 endmacro(create_cuda_tests)
 
 if(TEST_SUITE_CUDA_ROOT)
   create_cuda_tests()
 endif()