Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -20,16 +20,5 @@ namespace AZ
ScopedAutoTempDirectory::ScopedAutoTempDirectory()
{
}
ScopedAutoTempDirectory::~ScopedAutoTempDirectory()
{
}
const char* ScopedAutoTempDirectory::GetDirectory() const
{
AZ_Error("AzTest", false, "ScopedAutoTempDirectory not implemented on this platform.");
return nullptr;
}
} // Test
} // AZ
@@ -20,8 +20,13 @@
#define AZ_TRAIT_DISABLE_ALL_SAVE_DATA_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_ASSET_LOAD_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_ARCHIVE_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_ZERO_COLOR_CONVERSION_TEST true
#define AZ_TRAIT_DISABLE_FAILED_FRAMEPROFILER_TEST true
#define AZ_TRAIT_DISABLE_FAILED_FRAMEWORK_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_NETWORKING_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_GRADIENT_SIGNAL_TESTS true
@@ -33,3 +38,6 @@
#define AZ_TRAIT_DISABLE_FAILED_DLL_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_MODULE_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_EMOTION_FX_EDITOR_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_METRICS_TESTS true
#define AZ_TRAIT_DISABLE_ASSET_JOB_PARALLEL_TESTS true
@@ -11,6 +11,7 @@
set(FILES
../Common/UnixLike/AzTest/ColorizedOutput_UnixLike.cpp
../Common/UnixLike/AzTest/ScopedAutoTempDirectory_UnixLike.cpp
Platform_Mac.cpp
AzTest_Traits_Platform.h
AzTest_Traits_Mac.h
@@ -11,7 +11,7 @@
set(FILES
../Common/UnixLike/AzTest/ColorizedOutput_UnixLike.cpp
${common_dir}/Unimplemented/AzTest/ScopedAutoTempDirectory_Unimplemented.cpp
../Common/Unimplemented/AzTest/ScopedAutoTempDirectory_Unimplemented.cpp
Platform_iOS.cpp
AzTest_Traits_Platform.h
AzTest_Traits_iOS.h