Merge branch 'development' into TIF/Runtime

scripts/ctest/CMakeLists.txt

@@ -37,19 +37,6 @@ if(PAL_TRAIT_TEST_LYTESTTOOLS_SUPPORTED)
     endforeach()
 endif()
 
-# EPB Sanity test is being registered here to validate that the ly_add_editor_python_test function works.
-#if(PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_BUILD_TESTS_SUPPORTED AND AutomatedTesting IN_LIST LY_PROJECTS_TARGET_NAME)
-#    ly_add_editor_python_test(
-#        NAME epb_sanity_smoke_no_gpu
-#        TEST_PROJECT AutomatedTesting
-#        PATH ${CMAKE_CURRENT_LIST_DIR}/epb_sanity_test.py
-#        TEST_SUITE smoke
-#        TEST_SERIAL TRUE
-#        RUNTIME_DEPENDENCIES
-#            AutomatedTesting.Assets
-#    )
-#endif()
-
 # add a custom test which makes sure that the test filtering works!
 
 ly_add_test(

scripts/ctest/ctest_entrypoint.sh

@@ -14,7 +14,7 @@
 #
 
 CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE:-0}" )" >/dev/null 2>&1 && pwd )"
-DEV_DIR="$( dirname "$CURRENT_SCRIPT_DIR" )"
+DEV_DIR=$( dirname "$( dirname "$CURRENT_SCRIPT_DIR" )" )
 PYTHON=$DEV_DIR/python/python.sh
 CTEST_SCRIPT=$CURRENT_SCRIPT_DIR/ctest_driver.py
 

scripts/ctest/epb_sanity_test.py

@@ -1,21 +0,0 @@
-"""
-All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-its licensors.
-
-For complete copyright and license terms please see the LICENSE at the root of this
-distribution (the "License"). All use of this software is governed by the License,
-or, if provided, by the license below or the license accompanying this file. Do not
-remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-"""
-
-# Sanity test for EditorPythonBindings CTest wrapper
-
-import azlmbr.framework as framework
-
-print("EditorPythonBindings CTest Sanity Test")
-
-# A test should have logic to determine success (zero) or failure (non-zero) and 
-# return it to the caller. In this sanity test, always return success.
-return_code = 0
-framework.Terminate(return_code)