Merged stabilization/2106 to development; Resolved merge conflicts

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-12 10:45:23 -05:00
parent 504201aef2 7cfde884d9
commit e924ed0b86
221 changed files with 2398 additions and 9445 deletions
@@ -51,4 +51,18 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
            AutomatedTesting.GameLauncher
            AutomatedTesting.Assets
    )
+
+    ly_add_pytest(
+        NAME AutomatedTesting::GameLauncherWithGPU
+        TEST_SUITE sandbox
+        TEST_REQUIRES gpu
+        PATH ${CMAKE_CURRENT_LIST_DIR}/test_GameLauncher_EnterExitGameMode_Works.py
+        TIMEOUT 100
+        RUNTIME_DEPENDENCIES
+            AZ::AssetProcessor
+            AZ::PythonBindingsExample
+            Legacy::Editor
+            AutomatedTesting.GameLauncher
+            AutomatedTesting.Assets
+    )
 endif()