diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 65fb274ce..c9ff932c4 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -295,6 +295,7 @@ def record(adb: str, serial: str, path: str, seconds: float, display: int | None def pacing_summary(text: str, package: str = PACKAGE) -> dict: + text = text.replace("\r\n", "\n") records = {"game": [], "surface": []} for part in re.split(r"^displayRefreshRate = ", text, flags=re.M)[1:]: rate = re.match(r"(\d+)", part) diff --git a/tools/tests/test_droiddeckctl.py b/tools/tests/test_droiddeckctl.py index 731e3aa38..ad434989a 100644 --- a/tools/tests/test_droiddeckctl.py +++ b/tools/tests/test_droiddeckctl.py @@ -344,6 +344,11 @@ class DroiddeckctlTest(FakeAdbTest): self.assertEqual(248, summary["offCadence"]) self.assertEqual(13.8, summary["offCadencePercent"]) + def test_pacing_reads_a_dump_with_windows_line_ends(self): + summary = ctl.pacing_summary(TIMESTATS_SPLIT.replace("\n", "\r\n"), "com.droiddeck.launcher") + self.assertEqual(ctl.pacing_summary(TIMESTATS_SPLIT, "com.droiddeck.launcher"), summary) + self.assertEqual(1800, summary["frames"]) + def test_pacing_falls_back_to_the_sessions_surfaceview(self): summary = ctl.pacing_summary(TIMESTATS_SURFACEVIEW, "com.droiddeck.launcher") self.assertEqual(1, len(summary["layers"]))