Merge "Use -j1 in testOdrefresh"
diff --git a/compos/apk/assets/vm_config.json b/compos/apk/assets/vm_config.json
index 9c71942..3a6eff4 100644
--- a/compos/apk/assets/vm_config.json
+++ b/compos/apk/assets/vm_config.json
@@ -16,6 +16,15 @@
},
{
"name": "com.android.compos"
+ },
+ {
+ "name": "{DEX2OATBOOTCLASSPATH}"
+ },
+ {
+ "name": "{BOOTCLASSPATH}"
+ },
+ {
+ "name": "{SYSTEMSERVERCLASSPATH}"
}
]
}
\ No newline at end of file
diff --git a/compos/apk/assets/vm_test_config.json b/compos/apk/assets/vm_test_config.json
index 54a0aac..22f8293 100644
--- a/compos/apk/assets/vm_test_config.json
+++ b/compos/apk/assets/vm_test_config.json
@@ -13,6 +13,15 @@
},
{
"name": "com.android.compos"
+ },
+ {
+ "name": "{DEX2OATBOOTCLASSPATH}"
+ },
+ {
+ "name": "{BOOTCLASSPATH}"
+ },
+ {
+ "name": "{SYSTEMSERVERCLASSPATH}"
}
]
}
\ No newline at end of file
diff --git a/compos/tests/java/android/compos/test/ComposTestCase.java b/compos/tests/java/android/compos/test/ComposTestCase.java
index 01d8ff1..81e78ab 100644
--- a/compos/tests/java/android/compos/test/ComposTestCase.java
+++ b/compos/tests/java/android/compos/test/ComposTestCase.java
@@ -66,6 +66,14 @@
@After
public void tearDown() throws Exception {
killVmAndReconnectAdb();
+
+ CommandRunner android = new CommandRunner(getDevice());
+
+ // Clear up any CompOS instance files we created
+ android.tryRun("rm", "-rf", COMPOS_CURRENT_ROOT);
+
+ // And any artifacts generated by odrefresh
+ android.tryRun("rm", "-rf", ODREFRESH_OUTPUT_DIR);
}
@Test
diff --git a/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java b/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
index d62892c..5b7de58 100644
--- a/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
+++ b/tests/hostside/helper/java/android/virt/test/VirtualizationTestCaseBase.java
@@ -87,7 +87,7 @@
// Make sure we're connected to the host adb; this connection seems to get dropped when a VM
// exits.
- for (int retry = 0; retry < 3; ++retry) {
+ for (int retry = 0; retry < 10; ++retry) {
if (android.tryRun("true") != null) {
break;
}