Extend unit testing support in Trinity

.teamcity/MacOS/Project.kt

@@ -117,7 +117,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag
             name = "Run Tests"
             workingDir = "%env.CMAKE_BUILD_FOLDER%"
             path = "ctest"
-            arguments = "-C %env.CMAKE_CONFIG_TYPE% -V --output-on-failure --output-junit %env.CTEST_JUNIT_OUTPUT_FILE%"
+            arguments = "-C %env.CMAKE_CONFIG_TYPE% -V --output-on-failure --timeout 30 --output-junit %env.CTEST_JUNIT_OUTPUT_FILE%"
         }
         exec {
             name = "Package artifact"

.teamcity/Windows/Project.kt

@@ -111,7 +111,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String,
             name = "Run Tests"
             workingDir = "%env.CMAKE_BUILD_FOLDER%"
             path = "ctest"
-            arguments = "-C %env.CMAKE_CONFIG_TYPE% -V --output-on-failure --output-junit %env.CTEST_JUNIT_OUTPUT_FILE%"
+            arguments = "-C %env.CMAKE_CONFIG_TYPE% -V --output-on-failure --timeout 30 --output-junit %env.CTEST_JUNIT_OUTPUT_FILE%"
         }
         exec {
             name = "Package artifact"

CMakeLists.txt

@@ -11,6 +11,7 @@ if(BUILD_FOR_PYTHON_2)
     set(BUILD_METAL ON)
     set(BUILD_SHADER_COMPILER ON)
     set(INSTALL_TO_MONOLITH ON)
+    set(BUILD_TESTING OFF)
 
 else()
     # Feature options
@@ -50,6 +51,14 @@ endif()
 
 project(carbon-trinity VERSION 1.0.0)
 
+if(PROJECT_IS_TOP_LEVEL)
+    option(BUILD_TESTING "Build tests. Enabled by default." ON)
+endif()
+
+if(BUILD_TESTING)
+    enable_testing()
+endif()
+
 if (BUILD_FOR_PYTHON_2)
     if(NOT DEFINED ENV{CCP_EVE_PERFORCE_BRANCH_PATH})
         message(FATAL_ERROR "Missing required environment variable CCP_EVE_PERFORCE_BRANCH_PATH")

shadercompiler/CMakeLists.txt

@@ -306,18 +306,17 @@ else() # VCPKG install mode
 
 endif()
 
-option(BUILD_TESTING "Build and run tests. Enabled by default." ON)
-message(STATUS " BUILD_TESTING VALUE IS ${BUILD_TESTING}")
 if(BUILD_TESTING)
-
     find_package(GTest REQUIRED)
 
     add_executable(ShaderCompilerTest)
     target_compile_definitions(ShaderCompilerTest PRIVATE SHADER_COMPILER_TEST=1)
-    target_link_libraries(ShaderCompilerTest PRIVATE GTest::GTest GTest::Main)
+    target_link_libraries(ShaderCompilerTest PRIVATE GTest::GTest)
     target_sources(ShaderCompilerTest PRIVATE ${_TEST_SOURCES})
     source_group(Tests FILES ${_TEST_SOURCES})
     configure_shader_compiler(ShaderCompilerTest)
     set_target_properties(ShaderCompilerTest PROPERTIES FOLDER "Tests")
     add_dependencies(ShaderCompilerTest ShaderCompiler)
+
+    gtest_discover_tests(ShaderCompilerTest DISCOVERY_MODE PRE_TEST TEST_PREFIX ShaderCompiler.)
 endif()

shadercompiler/EffectCompilerMetal.cpp

@@ -4254,7 +4254,7 @@ std::string MetalTool( const char* name )
 		size_t programFilesSize;
 		getenv_s( &programFilesSize, programFiles, "PROGRAMFILES" );
 
-		cmd << "\"" << programFiles << "\\Metal Developer Tools\\metal\\macos\\bin\\" << name << ".exe\"";
+		cmd << "\"" << std::string( programFiles ) << "\\Metal Developer Tools\\metal\\macos\\bin\\" << name << ".exe\"";
 	}
 #else
 	cmd << "xcrun -sdk macosx " << name;

shadercompiler/tests/MetalConversionTest.cpp

@@ -8,6 +8,11 @@
 
 TEST( MetalConversion, TextureIndexingWorks )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
 	const char* src = R"SRC(
 Texture2D<float3> tex;
 
@@ -38,6 +43,10 @@ technique t0
 
 TEST( MetalConversion, AppliesPackedModifiersToCBuffers )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
 	const char* src = R"SRC(
 cbuffer cb0: register( b3 )
 {
@@ -72,6 +81,10 @@ technique t0
 
 TEST( MetalConversion, AddsRowsToMatrixInitializers )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
 	const char* src = R"SRC(
 float4 vs(): SV_Position
 {
@@ -105,6 +118,12 @@ technique t0
 
 TEST( MetalConversion, AppliesPackedModifiersToRtLocalBuffers )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
+
 	const char* src = R"SRC(
 struct HitInfo
 {
@@ -140,6 +159,11 @@ technique t0
 
 TEST( MetalConversion, AllowBindlessResources )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
 	const char* src = R"SRC(
 
 Buffer<float4> HeapView_BufferFloat4[]
@@ -186,6 +210,10 @@ technique t0
 
 TEST( MetalConversion, AllowLocalBufferVars )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
 	const char* src = R"SRC(
 
 Buffer<float4> HeapView_BufferFloat4[]
@@ -229,6 +257,11 @@ technique t0
 
 TEST( MetalConversion, AllowManySrvsUavs )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
 	const char* src = R"SRC(
 
 RWTexture2D<float4> Tex0;
@@ -338,6 +371,11 @@ technique t0
 
 TEST( MetalShaderPatching, CanHaveVertexID )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
 	const char* src = R"SRC(
 
 struct VSIn
@@ -381,6 +419,11 @@ technique t0
 
 TEST( MetalShaderPatching, CanHaveVertexIDWithIAInputs )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
 	const char* src = R"SRC(
 
 struct VSIn
@@ -425,6 +468,11 @@ technique t0
 
 TEST( MetalShaderPatching, CanHaveNestedStructs )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
 	const char* src = R"SRC(
 
 struct VSIn
@@ -472,6 +520,11 @@ technique t0
 
 TEST( MetalShaderPatching, CanHaveNestedStructsWithSystemSemanticsWithIAInputs1 )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
 	const char* src = R"SRC(
 
 struct VSIn
@@ -522,6 +575,11 @@ technique t0
 
 TEST( MetalShaderPatching, CanHaveNestedStructsWithSystemSemanticsWithIAInputs2 )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
 	const char* src = R"SRC(
 
 struct VSIn
@@ -572,6 +630,11 @@ technique t0
 
 TEST( MetalShaderPatching, CanHaveInstanceID )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
 	const char* src = R"SRC(
 
 struct VSIn
@@ -615,6 +678,11 @@ technique t0
 
 TEST( MetalShaderPatching, CanHaveInstanceIDWithIAInputs )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
 	const char* src = R"SRC(
 
 struct VSIn
@@ -659,6 +727,11 @@ technique t0
 
 TEST( MetalShaderPatching, CanHaveSystemSemanticMixedParameterAndIAInputs )
 {
+	if( !g_metalCompilerAvailable )
+	{
+		GTEST_SKIP() << "Skipping test: Metal compiler is not available.";
+	}
+
 	const char* src = R"SRC(
 
 struct VSIn