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

adjust location of disabling SC unit tests on Linux

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-07-26 13:20:08 -07:00
parent 91e84f1588
commit 3ad8f0dbf9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
+10 -10
View File
@@ -218,19 +218,14 @@ namespace ScriptCanvasEditor
if (!reporter.IsProcessOnly())
{
dependencies = LoadInterpretedDepencies(luaAssetResult.m_dependencies.source.userSubgraphs);
RuntimeDataOverrides runtimeDataOverrides;
runtimeDataOverrides.m_runtimeAsset = loadResult.m_runtimeAsset;
if (!dependencies.empty())
{
#if defined(LINUX) //////////////////////////////////////////////////////////////////////////
// Temporarily disable testing on the Linux build until the casing discrepancy
// is sorted out through the SC build and testing pipeline.
// Temporarily disable testing on the Linux build until the file name casing discrepancy
// is sorted out through the SC build and testing pipeline.
if (!luaAssetResult.m_dependencies.source.userSubgraphs.empty())
{
auto graphEntityId = AZ::Entity::MakeId();
reporter.SetGraph(graphEntityId);
loadResult.m_entity->Activate();
@@ -239,8 +234,13 @@ namespace ScriptCanvasEditor
reporter.FinishReport();
ScriptCanvas::SystemRequestBus::Broadcast(&ScriptCanvas::SystemRequests::MarkScriptUnitTestEnd);
return;
}
#else ///////////////////////////////////////////////////////////////////////////////////////
dependencies = LoadInterpretedDepencies(luaAssetResult.m_dependencies.source.userSubgraphs);
if (!dependencies.empty())
{
// #functions2_recursive_unit_tests eventually, this will need to be recursive, or the full asset handling system will need to be integrated into the testing framework
// in order to test functionality with a dependency stack greater than 2
@@ -274,8 +274,8 @@ namespace ScriptCanvasEditor
Execution::Context::InitializeActivationData(dependencyData);
Execution::InitializeInterpretedStatics(dependencyData);
}
#endif //////////////////////////////////////////////////////////////////////////////////////
}
#endif //////////////////////////////////////////////////////////////////////////////////////
loadResult.m_scriptAsset = luaAssetResult.m_scriptAsset;
loadResult.m_runtimeAsset.Get()->GetData().m_script = loadResult.m_scriptAsset;