Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712

Merged stabilization/2106 to development
2021-07-12 14:05:19 -05:00
parent c4a50b961e e924ed0b86
commit f278bbcd65
221 changed files with 2398 additions and 9445 deletions
@@ -47,8 +47,7 @@ set(ENABLED_GEMS
    LmbrCentral
    LyShine
    HttpRequestor
-    Atom_AtomBridge
-    PythonCoverage
+    Atom
    AWSCore
    AWSClientAuth
    AWSMetrics
@@ -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()