Integrating latest 47acbe8

Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp

@@ -25,6 +25,8 @@
 
 #include <utility>
 
+#include <AzTest/AzTest.h>
+
 namespace UnitTests
 {
     //using namespace testing;
@@ -478,12 +480,20 @@ namespace UnitTests
         TestGetSourcesByPath("dev/", { }, false);
     }
 
+#if AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
+    TEST_F(SourceFileRelocatorTest, DISABLED_GetSources_MultipleScanFolders_Fails)
+#else
     TEST_F(SourceFileRelocatorTest, GetSources_MultipleScanFolders_Fails)
+#endif // AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
     {
         TestGetSourcesByPath("*", { }, false);
     }
 
+#if AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
+    TEST_F(SourceFileRelocatorTest, DISABLED_GetSources_PartialPath_FailsWithNoResults)
+#else
     TEST_F(SourceFileRelocatorTest, GetSources_PartialPath_FailsWithNoResults)
+#endif // AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
     {
         TestGetSourcesByPath("older/*", { }, false);
     }
@@ -530,7 +540,11 @@ namespace UnitTests
         TestGetSourcesByPath(filePath.toUtf8().constData(), { "folder/file.foo" }, true, true);
     }
 
+#if AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
+    TEST_F(SourceFileRelocatorTest, DISABLED_GetSources_HaveMetadataDifferentFileCase_AbsolutePath_Succeeds)
+#else
     TEST_F(SourceFileRelocatorTest, GetSources_HaveMetadataDifferentFileCase_AbsolutePath_Succeeds)
+#endif // AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
     {
         QDir tempPath(m_tempDir.path());
 
@@ -900,7 +914,11 @@ namespace UnitTests
         ASSERT_FALSE(AZ::IO::FileIOBase::GetInstance()->Exists(filePath.toUtf8().constData()));
     }
 
+#if AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
+    TEST_F(SourceFileRelocatorTest, DISABLED_Delete_Real_Readonly_Fails)
+#else
     TEST_F(SourceFileRelocatorTest, Delete_Real_Readonly_Fails)
+#endif // AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
     {
         QDir tempPath(m_tempDir.path());