Merge "Turn on full logging on test VMs"
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 bc99e6e..5999af7 100644
--- a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
+++ b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
@@ -65,6 +65,15 @@
 
     private static final String KERNEL_VERSION = SystemProperties.get("ro.kernel.version");
 
+    private boolean isCuttlefish() {
+        String productName = SystemProperties.get("ro.product.name");
+        return (null != productName)
+                && (productName.startsWith("aosp_cf_x86")
+                        || productName.startsWith("aosp_cf_arm")
+                        || productName.startsWith("cf_x86")
+                        || productName.startsWith("cf_arm"));
+    }
+
     /** Copy output from the VM to logcat. This is helpful when things go wrong. */
     private static void logVmOutput(InputStream vmOutputStream, String name) {
         new Thread(
@@ -254,12 +263,11 @@
     @Test
     public void testMinimumRequiredRAM()
             throws VirtualMachineException, InterruptedException, IOException {
+        assume().withMessage("Skip on CF; too slow").that(isCuttlefish()).isFalse();
+
         int lo = 16, hi = 512, minimum = 0;
         boolean found = false;
 
-        // TODO(b/236672526): giving inefficient memory to pVM sometimes causes host crash.
-        assume().withMessage("Skip on pVM. b/236672526").that(mProtectedVm).isFalse();
-
         while (lo <= hi) {
             int mid = (lo + hi) / 2;
             if (canBootMicrodroidWithMemory(mid)) {
@@ -274,7 +282,7 @@
         assertThat(found).isTrue();
 
         Bundle bundle = new Bundle();
-        bundle.putInt("microdroid_minimum_required_memory", minimum);
+        bundle.putInt("avf_perf/microdroid/minimum_required_memory", minimum);
         mInstrumentation.sendStatus(0, bundle);
     }
 }