From 2555c88fe73628c3f2e02bb6ad620f5bf0d3942c Mon Sep 17 00:00:00 2001 From: jromnoa Date: Fri, 9 Jul 2021 07:42:57 -0700 Subject: [PATCH 1/2] this test needs to be disabled in main, it was supposed to be merged to development before break but got merged to stabilization and then main Signed-off-by: jromnoa --- .../Gem/PythonTests/smoke/CMakeLists.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt index af9fc142e2..9951b448d8 100644 --- a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt @@ -51,4 +51,17 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) AutomatedTesting.GameLauncher AutomatedTesting.Assets ) + +# ly_add_pytest( +# NAME AutomatedTesting::GameLauncherWithGPU +# 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() From a40c979baa570a07e705e006eba4bda6638d01b1 Mon Sep 17 00:00:00 2001 From: jromnoa Date: Fri, 9 Jul 2021 10:24:07 -0700 Subject: [PATCH 2/2] move test to sandbox instead of disabling it Signed-off-by: jromnoa --- .../Gem/PythonTests/smoke/CMakeLists.txt | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt index 9951b448d8..73af69b93a 100644 --- a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt @@ -52,16 +52,17 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) AutomatedTesting.Assets ) -# ly_add_pytest( -# NAME AutomatedTesting::GameLauncherWithGPU -# 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 -# ) + 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()