Ver Fonte

Merge pull request #16832 from aws-lumberyard-dev/spham_amzn/fix_ghi_16281_python_tests_on_sdk_builds

Fix for Project Manager being able to use remote repo gems that include python tests
Steve Pham há 1 ano atrás
pai
commit
fb36d25f31

+ 9 - 1
cmake/Platform/Android/PAL_android.cmake

@@ -13,7 +13,6 @@ ly_set(PAL_TRAIT_BUILD_HOST_GUI_TOOLS FALSE)
 ly_set(PAL_TRAIT_BUILD_HOST_TOOLS FALSE)
 ly_set(PAL_TRAIT_BUILD_SERVER_SUPPORTED FALSE)
 ly_set(PAL_TRAIT_BUILD_UNIFIED_SUPPORTED FALSE)
-ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNITY_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNITY_EXCLUDE_EXTENSIONS)
 ly_set(PAL_TRAIT_BUILD_EXCLUDE_ALL_TEST_RUNS_FROM_IDE TRUE)
@@ -21,6 +20,15 @@ ly_set(PAL_TRAIT_BUILD_CPACK_SUPPORTED FALSE)
 
 ly_set(PAL_TRAIT_PROF_PIX_SUPPORTED FALSE)
 
+# Determine if tests are supported based on the PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT global property
+get_property(is_test_supported_default_set GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT SET)
+if (is_test_supported_default_set)
+    get_property(test_supported_default GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT)
+    ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED ${test_supported_default})
+else()
+    ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
+endif()
+
 # Test library support
 ly_set(PAL_TRAIT_TEST_GOOGLE_TEST_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_TEST_GOOGLE_BENCHMARK_SUPPORTED FALSE)

+ 9 - 1
cmake/Platform/Linux/PAL_linux.cmake

@@ -13,7 +13,6 @@ ly_set(PAL_TRAIT_BUILD_HOST_GUI_TOOLS FALSE)
 ly_set(PAL_TRAIT_BUILD_HOST_TOOLS TRUE)
 ly_set(PAL_TRAIT_BUILD_SERVER_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNIFIED_SUPPORTED TRUE)
-ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNITY_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNITY_EXCLUDE_EXTENSIONS)
 ly_set(PAL_TRAIT_BUILD_EXCLUDE_ALL_TEST_RUNS_FROM_IDE FALSE)
@@ -21,6 +20,15 @@ ly_set(PAL_TRAIT_BUILD_CPACK_SUPPORTED TRUE)
 
 ly_set(PAL_TRAIT_PROF_PIX_SUPPORTED FALSE)
 
+# Determine if tests are supported based on the PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT global property
+get_property(is_test_supported_default_set GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT SET)
+if (is_test_supported_default_set)
+    get_property(test_supported_default GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT)
+    ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED ${test_supported_default})
+else()
+    ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
+endif()
+
 # Test library support
 ly_set(PAL_TRAIT_TEST_GOOGLE_TEST_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_TEST_GOOGLE_BENCHMARK_SUPPORTED TRUE)

+ 9 - 1
cmake/Platform/Mac/PAL_mac.cmake

@@ -13,7 +13,6 @@ ly_set(PAL_TRAIT_BUILD_HOST_GUI_TOOLS TRUE)
 ly_set(PAL_TRAIT_BUILD_HOST_TOOLS TRUE)
 ly_set(PAL_TRAIT_BUILD_SERVER_SUPPORTED FALSE)
 ly_set(PAL_TRAIT_BUILD_UNIFIED_SUPPORTED FALSE)
-ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNITY_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNITY_EXCLUDE_EXTENSIONS ".mm")
 ly_set(PAL_TRAIT_BUILD_EXCLUDE_ALL_TEST_RUNS_FROM_IDE FALSE)
@@ -21,6 +20,15 @@ ly_set(PAL_TRAIT_BUILD_CPACK_SUPPORTED FALSE)
 
 ly_set(PAL_TRAIT_PROF_PIX_SUPPORTED FALSE)
 
+# Determine if tests are supported based on the PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT global property
+get_property(is_test_supported_default_set GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT SET)
+if (is_test_supported_default_set)
+    get_property(test_supported_default GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT)
+    ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED ${test_supported_default})
+else()
+    ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
+endif()
+
 # Test library support
 ly_set(PAL_TRAIT_TEST_GOOGLE_TEST_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_TEST_GOOGLE_BENCHMARK_SUPPORTED TRUE)

+ 9 - 1
cmake/Platform/Windows/PAL_windows.cmake

@@ -11,7 +11,6 @@ ly_set(PAL_LINKOPTION_MODULE MODULE)
 
 ly_set(PAL_TRAIT_BUILD_HOST_GUI_TOOLS TRUE)
 ly_set(PAL_TRAIT_BUILD_HOST_TOOLS TRUE)
-ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_SERVER_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNIFIED_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNITY_SUPPORTED TRUE)
@@ -21,6 +20,15 @@ ly_set(PAL_TRAIT_BUILD_CPACK_SUPPORTED TRUE)
 
 ly_set(PAL_TRAIT_PROF_PIX_SUPPORTED TRUE)
 
+# Determine if tests are supported based on the PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT global property
+get_property(is_test_supported_default_set GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT SET)
+if (is_test_supported_default_set)
+    get_property(test_supported_default GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT)
+    ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED ${test_supported_default})
+else()
+    ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
+endif()
+
 # Test library support
 ly_set(PAL_TRAIT_TEST_GOOGLE_TEST_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_TEST_GOOGLE_BENCHMARK_SUPPORTED TRUE)

+ 9 - 1
cmake/Platform/iOS/PAL_ios.cmake

@@ -13,7 +13,6 @@ ly_set(PAL_TRAIT_BUILD_HOST_GUI_TOOLS FALSE)
 ly_set(PAL_TRAIT_BUILD_HOST_TOOLS FALSE)
 ly_set(PAL_TRAIT_BUILD_SERVER_SUPPORTED FALSE)
 ly_set(PAL_TRAIT_BUILD_UNIFIED_SUPPORTED FALSE)
-ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNITY_SUPPORTED TRUE)
 ly_set(PAL_TRAIT_BUILD_UNITY_EXCLUDE_EXTENSIONS ".mm")
 ly_set(PAL_TRAIT_BUILD_EXCLUDE_ALL_TEST_RUNS_FROM_IDE TRUE)
@@ -21,6 +20,15 @@ ly_set(PAL_TRAIT_BUILD_CPACK_SUPPORTED FALSE)
 
 ly_set(PAL_TRAIT_PROF_PIX_SUPPORTED FALSE)
 
+# Determine if tests are supported based on the PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT global property
+get_property(is_test_supported_default_set GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT SET)
+if (is_test_supported_default_set)
+    get_property(test_supported_default GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT)
+    ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED ${test_supported_default})
+else()
+    ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
+endif()
+
 # Test library support
 ly_set(PAL_TRAIT_TEST_GOOGLE_TEST_SUPPORTED FALSE)
 ly_set(PAL_TRAIT_TEST_GOOGLE_BENCHMARK_SUPPORTED FALSE)

+ 3 - 1
cmake/install/Findo3de.cmake.in

@@ -38,7 +38,9 @@ set_property(GLOBAL PROPERTY O3DE_ENGINE_ROOT_FOLDER "${engine_root_folder}")
 # then the PAL_TRAIT_BUILD_TESTS_SUPPORTED value needs to be propagated as FALSE
 set(disable_test_modules @LY_DISABLE_TEST_MODULES@)
 if (disable_test_modules)
-    set(PAL_TRAIT_BUILD_TESTS_SUPPORTED FALSE)
+    set_property(GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT FALSE)
+else()
+    set_property(GLOBAL PROPERTY PAL_TRAIT_BUILD_TESTS_SUPPORTED_DEFAULT TRUE)
 endif()
 
 if ($ENV{O3DE_SNAP})