Prefix test binaries with `test_`, rename UnitSPIRV, update README.

diff --git a/README.md b/README.md
index 4cc8ac9..7591950 100644 (file)
--- a/README.md
+++ b/README.md
@@ -277,13 +277,8 @@ This is experimental.
 
 ### Tests
 
-Tests are only built when googletest is found.
-
-The `<spirv-build-dir>/test/UnitSPIRV` executable runs the project tests.
-It supports the standard `googletest` command line options.
-
-The project also adds a CMake test `spirv-tools-testsuite`, which executes
-`UnitSPIRV`.  That way it's possible to run the tests using `ctest`.
+Tests are only built when googletest is found. Use `ctest` to run all the
+tests.
 
 ## Future Work
 <a name="future"></a>

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5b71d43..b4d8811 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,29 +34,30 @@ function(add_spvtools_unittest)
     set(multi_value_args SRCS LIBS)
     cmake_parse_arguments(
       ARG "" "${one_value_args}" "${multi_value_args}" ${ARGN})
-    add_executable(${ARG_TARGET} ${ARG_SRCS})
-    spvtools_default_compile_options(${ARG_TARGET})
+    set(target test_${ARG_TARGET})
+    add_executable(${target} ${ARG_SRCS})
+    spvtools_default_compile_options(${target})
     if(${COMPILER_IS_LIKE_GNU})
-      target_compile_options(${ARG_TARGET} PRIVATE -Wno-undef)
+      target_compile_options(${target} PRIVATE -Wno-undef)
     endif()
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
       # Disable C4503 "decorated name length exceeded" warning,
       # triggered by some heavily templated types.
       # We don't care much about that in test code.
       # Important to do since we have warnings-as-errors.
-      target_compile_options(${ARG_TARGET} PRIVATE /wd4503)
+      target_compile_options(${target} PRIVATE /wd4503)
     endif()
-    target_include_directories(${ARG_TARGET} PRIVATE
-      ${spirv-tools_SOURCE_DIR}/test
+    target_include_directories(${target} PRIVATE
+      ${SPIRV_HEADER_INCLUDE_DIR}
       ${spirv-tools_SOURCE_DIR}
       ${spirv-tools_SOURCE_DIR}/include
-      ${SPIRV_HEADER_INCLUDE_DIR}
+      ${spirv-tools_SOURCE_DIR}/test
       ${gtest_SOURCE_DIR}/include
       ${gmock_SOURCE_DIR}/include
     )
-    target_link_libraries(${ARG_TARGET} PRIVATE ${ARG_LIBS})
-    target_link_libraries(${ARG_TARGET} PRIVATE gmock_main)
-    add_test(NAME spirv-tools-${ARG_TARGET} COMMAND ${ARG_TARGET})
+    target_link_libraries(${target} PRIVATE ${ARG_LIBS})
+    target_link_libraries(${target} PRIVATE gmock_main)
+    add_test(NAME spirv-tools-${target} COMMAND ${target})
   endif()
 endfunction()
 
@@ -129,7 +130,7 @@ set(TEST_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/ValidationState.cpp
 )
 add_spvtools_unittest(
-  TARGET UnitSPIRV
+  TARGET spirv_unit_tests
   SRCS ${TEST_SOURCES}
   LIBS ${SPIRV_TOOLS})