Skip to content

Enable FrameTimingManager tests in standalone builds #6019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 16, 2021
Merged

Enable FrameTimingManager tests in standalone builds #6019

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c55607e
Enable runtime profiler tests whenever FTM is enabled.
arttu-peltonen Oct 14, 2021
a58321b
Disable runtimeprofiler test on Linux due to backend instabilities (c…
arttu-peltonen Nov 11, 2021
27b2a88
Use yield return null instead of WaitForEndOfFrame to skip frames.
arttu-peltonen Nov 12, 2021
de91d5f
Merge branch 'master' into rpw/debugui-warning-frametiming-disabled
arttu-peltonen Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions com.unity.render-pipelines.core/Tests/Runtime/RuntimeProfilerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ class RuntimeProfilerTestBase
[SetUp]
public void Setup()
{
#if UNITY_EDITOR
if (!UnityEditor.PlayerSettings.enableFrameTimingStats)
if (!FrameTimingManager.IsFeatureEnabled())
Assert.Ignore("Frame timing stats are disabled in Player Settings, skipping test.");
#endif

// HACK #1 - really shouldn't have to do this here, but previous tests are leaking gameobjects
var objects = GameObject.FindObjectsOfType<GameObject>();
Expand All @@ -48,15 +46,13 @@ public void TearDown()
protected IEnumerator Warmup()
{
for (int i = 0; i < k_NumWarmupFrames; i++)
yield return new WaitForEndOfFrame();
yield return null;

m_DebugFrameTiming.Reset();
}
}

// FIXME: Tests are disabled in player builds for now, since there's no API that tells whether frame timing is
// enabled or not. Re-enable if that changes.
#if UNITY_EDITOR
[UnityPlatform(exclude = new RuntimePlatform[] { RuntimePlatform.LinuxPlayer, RuntimePlatform.LinuxEditor })] // Disabled on Linux (case 1370861)
class RuntimeProfilerTests : RuntimeProfilerTestBase
{
[UnityTest]
Expand All @@ -70,7 +66,7 @@ public IEnumerator RuntimeProfilerGivesNonZeroOutput()
{
m_DebugFrameTiming.UpdateFrameTiming();
camera.Render();
yield return new WaitForEndOfFrame();
yield return null;
}

Assert.True(
Expand All @@ -80,5 +76,4 @@ public IEnumerator RuntimeProfilerGivesNonZeroOutput()
m_DebugFrameTiming.m_BottleneckHistory.Histogram.PresentLimited > 0);
}
}
#endif
}