commit da7264a49e9dca6c491ae515ab3c0653db30490e
author Inseob Kim <inseob@google.com> Mon Sep 26 08:46:55 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 26 08:46:55 2022 +0000
tree 652537c4e30f8f653a38e3e7a60365e314923a0f
parent edc1998b3cb8d5d623f718b562180b84ff44e959
parent 7a52b0fbe27978b581cdb045ee6fcd9f9b9665e5

Merge "Revert "Add debug property to skip benchmarks""

tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java

diff --git a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
index 41661e9..7bf3c4e 100644
--- a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
+++ b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
@@ -76,7 +76,6 @@
 
     @Before
     public void setup() {
-        assume().that(shouldSkipBenchmarks()).isFalse();
         prepareTestSetup(mProtectedVm);
         mInstrumentation = getInstrumentation();
     }

tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java

diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
index c0b76da..fdc846e 100644
--- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
+++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -51,10 +51,6 @@
         return VirtualizationTestHelper.isCuttlefish(SystemProperties.get("ro.product.name"));
     }
 
-    public static boolean shouldSkipBenchmarks() {
-        return SystemProperties.getBoolean("debug.avf.benchmark.skip", false);
-    }
-
     // TODO(b/220920264): remove Inner class; this is a hack to hide virt APEX types
     protected static class Inner {
         private final boolean mProtectedVm;