Merge branch 'development' into cmake/warn_virtual

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/IConsole.h
#	Code/Legacy/CrySystem/LocalizedStringManager.h
#	Code/Legacy/CrySystem/XConsole.h
#	Code/Legacy/CrySystem/XConsoleVariable.h
#	Code/Legacy/CrySystem/XML/XmlUtils.cpp
#	cmake/Platform/Common/Clang/Configurations_clang.cmake
This commit is contained in:
Esteban Papp
2021-09-07 18:42:40 -07:00
228 changed files with 1196 additions and 16357 deletions
@@ -278,7 +278,7 @@ static void *thread_logger_func(void*)
--readSize;
}
logBuffer[readSize] = '\0';
((void) __android_log_print(ANDROID_LOG_INFO, s_logTag, logBuffer));
((void) __android_log_print(ANDROID_LOG_INFO, s_logTag, "%s", logBuffer));
}
}
return 0;
@@ -266,7 +266,8 @@ namespace TestImpact
{
{ SuiteTypeAsString(SuiteType::Main), SuiteType::Main },
{ SuiteTypeAsString(SuiteType::Periodic), SuiteType::Periodic },
{ SuiteTypeAsString(SuiteType::Sandbox), SuiteType::Sandbox }
{ SuiteTypeAsString(SuiteType::Sandbox), SuiteType::Sandbox },
{ SuiteTypeAsString(SuiteType::AWSI), SuiteType::AWSI }
};
return ParseMultiStateOption(OptionKeys[SuiteFilterKey], states, cmd).value_or(SuiteType::Main);
@@ -472,7 +473,7 @@ namespace TestImpact
" available, no prioritization will occur).\n"
" -maxconcurrency=<number> The maximum number of concurrent test targets/shards to be in flight at \n"
" any given moment.\n"
" -suite=<main, periodic, sandbox> The test suite to select from for this test sequence.";
" -suite=<main, periodic, sandbox, awsi> The test suite to select from for this test sequence.";
return help;
}
@@ -30,7 +30,8 @@ namespace TestImpact
{
Main = 0,
Periodic,
Sandbox
Sandbox,
AWSI
};
//! Result of a test sequence that was run.
@@ -53,6 +53,8 @@ namespace TestImpact
return "periodic";
case SuiteType::Sandbox:
return "sandbox";
case SuiteType::AWSI:
return "awsi";
default:
throw(Exception("Unexpected suite type"));
}