| commit | 7a52b0fbe27978b581cdb045ee6fcd9f9b9665e5 | [log] [tgz] |
|---|---|---|
| author | Inseob Kim <inseob@google.com> | Mon Sep 26 17:44:41 2022 +0900 |
| committer | Inseob Kim <inseob@google.com> | Mon Sep 26 17:45:14 2022 +0900 |
| tree | eb8adfd672cca436b8f7db79d3bf635a0447e1ac | |
| parent | ef919383137db858c8fee47b16fe602a8e2c592b [diff] |
Revert "Add debug property to skip benchmarks" This reverts commit ef919383137db858c8fee47b16fe602a8e2c592b. Reason for revert: conflicts with other changes Change-Id: I3ce82baabaf59b561cffc49c9cf08aa2ff84a8d9
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(); }
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;