commit 0b17b4a5ad6c87c4247023f3229a6ac617d58619
author Ady Abraham <adyabr@google.com> Wed Jan 04 23:25:25 2023 +0000
committer Ady Abraham <adyabr@google.com> Wed Jan 04 15:25:49 2023 -0800
tree b986ae759325aaefc0381e992675f78c2fff3ebd
parent 78c84d62bdc4ebe288c7cfaf6ddf9febc47d227d

Revert "SF: Update RefreshRateSelectorTest to remove g_noSlowTests from some tests"

This reverts commit 70991e3b006b7665d24c2202bc26caff9a9e78f4.

Reason for revert: Fixing the original bug (b/261520501) in a different way that doesn't create a long list of refresh rates divisors

Change-Id: I85bc458b7fd4cf45c2e03a942b26423dc883e0d1

services/surfaceflinger/tests/unittests/RefreshRateSelectorTest.cpp

diff --git a/services/surfaceflinger/tests/unittests/RefreshRateSelectorTest.cpp b/services/surfaceflinger/tests/unittests/RefreshRateSelectorTest.cpp
index a78f42c..c9fefe3 100644
--- a/services/surfaceflinger/tests/unittests/RefreshRateSelectorTest.cpp
+++ b/services/surfaceflinger/tests/unittests/RefreshRateSelectorTest.cpp
@@ -2508,6 +2508,10 @@
 // b/190578904
 TEST_P(RefreshRateSelectorTest,
        getBestFrameRateMode_withCloseRefreshRates_LayerVoteType_Heuristic) {
+    if (g_noSlowTests) {
+        GTEST_SKIP();
+    }
+
     const int kMinRefreshRate = RefreshRateSelector::kMinSupportedFrameRate.getIntValue();
     constexpr int kMaxRefreshRate = 240;
 
@@ -2536,6 +2540,10 @@
 }
 TEST_P(RefreshRateSelectorTest,
        getBestFrameRateMode_withCloseRefreshRates_LayerVoteType_ExplicitDefault) {
+    if (g_noSlowTests) {
+        GTEST_SKIP();
+    }
+
     const int kMinRefreshRate = RefreshRateSelector::kMinSupportedFrameRate.getIntValue();
     constexpr int kMaxRefreshRate = 240;
 
@@ -2564,6 +2572,10 @@
 }
 TEST_P(RefreshRateSelectorTest,
        getBestFrameRateMode_withCloseRefreshRates_LayerVoteType_ExplicitExactOrMultiple) {
+    if (g_noSlowTests) {
+        GTEST_SKIP();
+    }
+
     const int kMinRefreshRate = RefreshRateSelector::kMinSupportedFrameRate.getIntValue();
     constexpr int kMaxRefreshRate = 240;
 
@@ -2592,6 +2604,10 @@
 }
 TEST_P(RefreshRateSelectorTest,
        getBestFrameRateMode_withCloseRefreshRates_LayerVoteType_ExplicitExact) {
+    if (g_noSlowTests) {
+        GTEST_SKIP();
+    }
+
     const int kMinRefreshRate = RefreshRateSelector::kMinSupportedFrameRate.getIntValue();
     constexpr int kMaxRefreshRate = 240;