Check configuration and gmock existence when adding unit tests.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdb9f3b..bb9fe7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,8 +116,8 @@
# But it still depends on MSVCRT.dll.
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
- set_target_properties(${TARGET} PROPERTIES LINK_FLAGS
- -static -static-libgcc -static-libstdc++)
+ set_target_properties(${TARGET} PROPERTIES
+ LINK_FLAGS -static -static-libgcc -static-libstdc++)
endif()
endif()
endfunction()
@@ -138,8 +138,13 @@
# Defaults to OFF if the user didn't set it.
option(SPIRV_SKIP_EXECUTABLES
- "Skip building the executable and tests along with the library"
- ${SPIRV_SKIP_EXECUTABLES})
+ "Skip building the executable and tests along with the library"
+ ${SPIRV_SKIP_EXECUTABLES})
+option(SPIRV_SKIP_TESTS
+ "Skip building tests along with the library" ${SPIRV_SKIP_TESTS})
+if ("${SPIRV_SKIP_EXECUTABLES}")
+ set(SPIRV_SKIP_TESTS ON)
+endif()
add_subdirectory(external)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 971e5ac..df0154f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -30,118 +30,121 @@
# SRCS src_file.h src_file.cpp
# LIBS lib1 lib2
# )
-function(add_spvtools_unittest)
- set(one_value_args TARGET)
- 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})
- if(${COMPILER_IS_LIKE_GNU})
- target_compile_options(${ARG_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)
- endif()
- target_include_directories(${ARG_TARGET} PRIVATE
- ${spirv-tools_SOURCE_DIR}
- ${spirv-tools_SOURCE_DIR}/include
- ${SPIRV_HEADER_INCLUDE_DIR}
- ${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})
-endfunction()
-if (NOT ${SPIRV_SKIP_EXECUTABLES})
- if (TARGET gmock)
+if (NOT "${SPIRV_SKIP_TESTS}")
+ if (TARGET gmock_main)
message(STATUS "Found Google Mock, building tests.")
-
- set(TEST_SOURCES
- ${CMAKE_CURRENT_SOURCE_DIR}/TestFixture.h
- ${CMAKE_CURRENT_SOURCE_DIR}/UnitSPIRV.h
-
- ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyContext.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyFormat.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/BinaryDestroy.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/BinaryEndianness.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/BinaryHeaderGet.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/BinaryParse.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/BinaryToText.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/BinaryToText.Literal.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/Comment.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/DiagnosticDestroy.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/DiagnosticPrint.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/DiagnosticStream.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/ExtInstGLSLstd450.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/ExtInst.OpenCL.std.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/FixWord.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/GeneratorMagicNumber.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/HexFloat.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/ImmediateInt.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/LibspirvMacros.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/NamedId.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/NameMapper.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeMake.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeRequiresCapabilities.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeSplit.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeTableGet.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/OperandCapabilities.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/Operand.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/OperandPattern.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/SoftwareVersion.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextAdvance.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextDestroy.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextLiteral.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextStartsNewInst.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Annotation.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Barrier.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Constant.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.ControlFlow.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Debug.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.DeviceSideEnqueue.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Extension.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Function.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Group.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Image.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Literal.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Memory.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Miscellaneous.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.ModeSetting.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.PipeStorage.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.TypeDeclaration.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.SubgroupDispatch.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/TextWordGet.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/UnitSPIRV.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/ValidateFixtures.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/Validate.Capability.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/Validate.CFG.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/Validate.Layout.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/Validate.Storage.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/Validate.SSA.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/ValidateID.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/ValidationState.cpp
- )
- add_spvtools_unittest(
- TARGET UnitSPIRV
- SRCS ${TEST_SOURCES}
- LIBS ${SPIRV_TOOLS})
-
- add_spvtools_unittest(
- TARGET cpp_interface
- SRCS cpp_interface.cpp
- LIBS SPIRV-Tools-opt ${SPIRV_TOOLS})
-
- add_subdirectory(opt)
else()
message(STATUS "Did not find googletest, tests will not be built."
"To enable tests place googletest in '<spirv-dir>/external/googletest'.")
endif()
endif()
+
+function(add_spvtools_unittest)
+ if (NOT "${SPIRV_SKIP_TESTS}" AND TARGET gmock_main)
+ set(one_value_args TARGET)
+ 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})
+ if(${COMPILER_IS_LIKE_GNU})
+ target_compile_options(${ARG_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)
+ endif()
+ target_include_directories(${ARG_TARGET} PRIVATE
+ ${spirv-tools_SOURCE_DIR}
+ ${spirv-tools_SOURCE_DIR}/include
+ ${SPIRV_HEADER_INCLUDE_DIR}
+ ${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})
+ endif()
+endfunction()
+
+set(TEST_SOURCES
+ ${CMAKE_CURRENT_SOURCE_DIR}/TestFixture.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/UnitSPIRV.h
+
+ ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyContext.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyFormat.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/BinaryDestroy.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/BinaryEndianness.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/BinaryHeaderGet.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/BinaryParse.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/BinaryToText.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/BinaryToText.Literal.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/Comment.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DiagnosticDestroy.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DiagnosticPrint.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DiagnosticStream.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/ExtInstGLSLstd450.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/ExtInst.OpenCL.std.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/FixWord.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/GeneratorMagicNumber.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/HexFloat.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/ImmediateInt.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/LibspirvMacros.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/NamedId.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/NameMapper.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeMake.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeRequiresCapabilities.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeSplit.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeTableGet.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/OperandCapabilities.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/Operand.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/OperandPattern.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/SoftwareVersion.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextAdvance.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextDestroy.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextLiteral.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextStartsNewInst.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Annotation.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Barrier.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Constant.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.ControlFlow.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Debug.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.DeviceSideEnqueue.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Extension.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Function.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Group.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Image.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Literal.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Memory.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Miscellaneous.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.ModeSetting.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.PipeStorage.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.TypeDeclaration.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.SubgroupDispatch.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/TextWordGet.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/UnitSPIRV.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/ValidateFixtures.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/Validate.Capability.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/Validate.CFG.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/Validate.Layout.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/Validate.Storage.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/Validate.SSA.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/ValidateID.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/ValidationState.cpp
+)
+add_spvtools_unittest(
+ TARGET UnitSPIRV
+ SRCS ${TEST_SOURCES}
+ LIBS ${SPIRV_TOOLS})
+
+add_spvtools_unittest(
+ TARGET cpp_interface
+ SRCS cpp_interface.cpp
+ LIBS SPIRV-Tools-opt ${SPIRV_TOOLS})
+
+add_subdirectory(opt)
