Revert "Disable ComposTestCase on Cuttlefish"
This reverts commit a35f212ffaaf9e0a95290f756b41a7023e6fc0ee.
Reason for revert: b/264496291#comment144 - the bug causing the problems has been fixed.
Bug: 264496291
Change-Id: If933ddf0a28a5cbfd2b52b19c98dae4f9e47ac56
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d17b434..3217ee1 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -4,9 +4,6 @@
"name": "MicrodroidHostTestCases"
},
{
- "name": "ComposHostTestCases"
- },
- {
"name": "MicrodroidTestApp"
},
{
@@ -36,6 +33,9 @@
"name": "ComposBenchmarkApp"
},
{
+ "name": "ComposHostTestCases"
+ },
+ {
"name": "AVFHostTestCases"
}
],
diff --git a/compos/tests/java/android/compos/test/ComposTestCase.java b/compos/tests/java/android/compos/test/ComposTestCase.java
index 8c7aeeb..eb2e072 100644
--- a/compos/tests/java/android/compos/test/ComposTestCase.java
+++ b/compos/tests/java/android/compos/test/ComposTestCase.java
@@ -23,8 +23,6 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assume.assumeFalse;
-
import android.platform.test.annotations.RootPermissionTest;
import com.android.microdroid.test.host.CommandRunner;
@@ -83,8 +81,6 @@
@Before
public void setUp() throws Exception {
assumeDeviceIsCapable(getDevice());
- // We get a very high level of (apparently bogus) OOM errors on Cuttlefish (b/264496291).
- assumeFalse("Skipping test on Cuttlefish", isCuttlefish());
String value = getDevice().getProperty(SYSTEM_SERVER_COMPILER_FILTER_PROP_NAME);
if (value == null) {