izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Mergine engine changes to //UE4/Main @ 2748007

Browse Source 
[CL 2748770 by Nick Penwarden in Main branch]
This commit is contained in:
Nick Penwarden
2015-10-30 17:41:13 -04:00
committed by Nick.Penwarden@epicgames.com
parent 125b69e469
commit 4ccf8be305
167 changed files with 4973 additions and 1865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Engine/Source/Developer/FunctionalTesting/Private/FunctionalTestingManager.cpp
View File

@@ -87,6 +87,8 @@ bool UFunctionalTestingManager::RunAllFunctionalTests(UObject* WorldContext, boo
UE_LOG(LogFunctionalTest, Warning, TEXT("Functional tests are already running, aborting."));
return true;
}
WorldContext->GetWorld()->ForceGarbageCollection(true);
Manager->bFinished = false;
Manager->bLooped = bRunLooped;
@@ -105,6 +107,12 @@ bool UFunctionalTestingManager::RunAllFunctionalTests(UObject* WorldContext, boo
}
else
{
for (TActorIterator<APhasedAutomationActorBase> It(WorldContext->GetWorld()); It; ++It)
{
APhasedAutomationActorBase* PAA = (*It);
Manager->OnTestsComplete.AddDynamic(PAA, &APhasedAutomationActorBase::OnFunctionalTestingComplete);
}
for (TActorIterator<AFunctionalTest> It(WorldContext->GetWorld()); It; ++It)
{
AFunctionalTest* Test = (*It);
@@ -210,12 +218,21 @@ void UFunctionalTestingManager::NotifyTestDone(AFunctionalTest* FTest)
if (FTest->OnWantsReRunCheck() == false && FTest->WantsToRunAgain() == false)
{
TestsLeft.RemoveSingle(FTest);
/*if (bDiscardSuccessfulTests && FTest->IsSuccessful())
//We can also do named reruns. These are lower priority than those triggered above.
//These names can be querried by phases to alter behviour in re-runs.
if (FTest->RerunCauses.Num() > 0)
{
FTest->CurrentRerunCause = FTest->RerunCauses.Pop();
}
else
{
TestsLeft.RemoveSingle(FTest);
/*if (bDiscardSuccessfulTests && FTest->IsSuccessful())
{
AllTests.RemoveSingle(FTest);
}*/
FTest->CleanUp();
}*/
FTest->CleanUp();
}
}
if (TestsLeft.Num() > 0 || TestReproStrings.Num() > 0)
@@ -259,6 +276,7 @@ void UFunctionalTestingManager::AllTestsDone()
}
else
{
OnTestsComplete.Broadcast();
bFinished = true;
UE_LOG(LogFunctionalTest, Log, TEXT("DONE."));
RemoveFromRoot();