pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable ComposTestCase on Cuttlefish 

It is very flaky, with a high level of OOM errors both inside &
outside the VM. This doesn't seem to indicate a real problem, but
causes presubmit problems.

Also revert commit a6a67730f0 and move
the test back to our presubmit. If that is successful, we can then do
the same for other TEST_MAPPING files.

Bug: 264496291
Test: atest ComposHostTestCases
Change-Id: I2487f555c35ffdb5610efb67146922762ee170a4
This commit is contained in:
Alan Stokes 2023-04-06 10:24:07 +01:00
parent 30d0e48439
commit a35f212ffa
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TEST_MAPPING
View File

@ -3,6 +3,9 @@
{ {
"name": "MicrodroidHostTestCases" "name": "MicrodroidHostTestCases"
}, },
{
"name": "ComposHostTestCases"
},
{ {
"name": "MicrodroidTestApp" "name": "MicrodroidTestApp"
}, },
@ -32,9 +35,6 @@
{ {
"name": "ComposBenchmarkApp" "name": "ComposBenchmarkApp"
}, },
{
"name": "ComposHostTestCases"
},
{ {
"name": "AVFHostTestCases" "name": "AVFHostTestCases"
} }

4
compos/tests/java/android/compos/test/ComposTestCase.java
View File

@ -23,6 +23,8 @@ import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage; import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assume.assumeFalse;
import android.platform.test.annotations.RootPermissionTest; import android.platform.test.annotations.RootPermissionTest;
import com.android.microdroid.test.host.CommandRunner; import com.android.microdroid.test.host.CommandRunner;
@ -81,6 +83,8 @@ public final class ComposTestCase extends MicrodroidHostTestCaseBase {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
assumeDeviceIsCapable(getDevice()); 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); String value = getDevice().getProperty(SYSTEM_SERVER_COMPILER_FILTER_PROP_NAME);
if (value == null) { if (value == null) {