birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert changes to tests where segfault occurs

Browse Source
This commit is contained in:
amzn-sj
2021-05-24 15:42:34 -07:00
parent 1a360094d2
commit e056fdda6b
4 changed files with 0 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/Tests/FileTagTests.cpp
-7
View File
@@ -14,7 +14,6 @@
#include <AzCore/IO/SystemFile.h>
#include <AzCore/std/containers/set.h>
#include <AzCore/std/smart_ptr/unique_ptr.h>
#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
#include <AzCore/UnitTest/TestTypes.h>
#include <AzCore/UserSettings/UserSettingsComponent.h>
#include <AzFramework/Application/Application.h>
@@ -85,12 +84,6 @@ namespace UnitTest
{
AllocatorsFixture::SetUp();
AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
auto projectPathKey =
AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
registry->Set(projectPathKey, "AutomatedTesting");
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
m_data = AZStd::make_unique<StaticData>();
using namespace AzFramework::FileTag;
AZ::ComponentApplication::Descriptor desc;
Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
-21
View File
@@ -35,21 +35,6 @@ PlatformConfigurationUnitTests::PlatformConfigurationUnitTests()
void PlatformConfigurationUnitTests::SetUp()
{
AZ::SettingsRegistryInterface* registry = nullptr;
if (!AZ::SettingsRegistry::Get())
{
AZ::SettingsRegistry::Register(&m_registry);
registry = &m_registry;
}
else
{
registry = AZ::SettingsRegistry::Get();
}
auto projectPathKey = AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
+ "/project_path";
registry->Set(projectPathKey, "AutomatedTesting");
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
using namespace AssetProcessor;
m_qApp = new QCoreApplication(m_argc, m_argv);
AssetProcessorTest::SetUp();
@@ -61,12 +46,6 @@ void PlatformConfigurationUnitTests::TearDown()
AssetUtilities::ResetAssetRoot();
delete m_qApp;
AssetProcessor::AssetProcessorTest::TearDown();
auto settingsRegistry = AZ::SettingsRegistry::Get();
if(settingsRegistry == &m_registry)
{
AZ::SettingsRegistry::Unregister(settingsRegistry);
}
}
TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_BadPlatform)
Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.h
-2
View File
@@ -13,7 +13,6 @@
#pragma once
#include <AzTest/AzTest.h>
#include <AzCore/Settings/SettingsRegistryImpl.h>
#include <QCoreApplication>
#include "native/tests/AssetProcessorTest.h"
#include "native/unittests/UnitTestRunner.h"
@@ -38,6 +37,5 @@ private:
int m_argc;
char** m_argv;
QCoreApplication* m_qApp;
AZ::SettingsRegistryImpl m_registry;
};
Gems/LmbrCentral/Code/Tests/Builders/MaterialBuilderTests.cpp
-24
View File
@@ -16,8 +16,6 @@
#include <AzTest/Utils.h>
#include <AzCore/UnitTest/TestTypes.h>
#include <AzCore/IO/FileIO.h>
#include <AzCore/Settings/SettingsRegistryImpl.h>
#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
#include <AzFramework/StringFunc/StringFunc.h>
#include <AzToolsFramework/Application/ToolsApplication.h>
#include <AssetBuilderSDK/AssetBuilderSDK.h>
@@ -45,21 +43,6 @@ protected:
AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
AZ::Debug::TraceMessageBus::Handler::BusConnect();
AZ::SettingsRegistryInterface* registry = nullptr;
if (!AZ::SettingsRegistry::Get())
{
AZ::SettingsRegistry::Register(&m_registry);
registry = &m_registry;
}
else
{
registry = AZ::SettingsRegistry::Get();
}
auto projectPathKey = AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
+ "/project_path";
registry->Set(projectPathKey, "AutomatedTesting");
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
const AZStd::string engineRoot = AZ::Test::GetEngineRootPath();
AZ::IO::FileIOBase::GetInstance()->SetAlias("@engroot@", engineRoot.c_str());
@@ -71,12 +54,6 @@ protected:
void TearDown() override
{
auto settingsRegistry = AZ::SettingsRegistry::Get();
if(settingsRegistry == &m_registry)
{
AZ::SettingsRegistry::Unregister(settingsRegistry);
}
AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
m_app->Stop();
m_app.reset();
@@ -144,7 +121,6 @@ protected:
}
AZStd::unique_ptr<AzToolsFramework::ToolsApplication> m_app;
AZ::SettingsRegistryImpl m_registry;
};
TEST_F(MaterialBuilderTests, MaterialBuilder_EmptyFile_ExpectFailure)