Merge branch 'main' into ly-as-sdk/LYN-2948

# Conflicts: # CMakeLists.txt # Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h # Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json # cmake/LYWrappers.cmake # cmake/SettingsRegistry.cmake # scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
parent 32919b1e7b 9b1be43367
commit f1b688f435
478 changed files with 5992 additions and 2253 deletions
@@ -18,6 +18,7 @@
 #include <EditorPythonBindings/EditorPythonBindingsBus.h>

 #include <AzCore/Debug/TraceMessageBus.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>

@@ -322,6 +323,13 @@ sys.version
        void SetUp() override
        {
            PythonTestingFixture::SetUp();
+
+            auto registry = AZ::SettingsRegistry::Get();
+            auto projectPathKey = AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
+                + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
            m_app.RegisterComponentDescriptor(EditorPythonBindings::PythonSystemComponent::CreateDescriptor());
        }