Enable verifyCompilationLogGenerated for CompOS test
... but skip compilation log verification, just because it's not
generated in CompOS, and it's not useful to generate.
Bug: 213573626
Test: atest odsign_e2e_test
Change-Id: I1857d7e9e72e632906714f14bb1ad74c96ccc061
diff --git a/test/odsign/test-src/com/android/tests/odsign/ActivationTest.java b/test/odsign/test-src/com/android/tests/odsign/ActivationTest.java
index c6c8b38..374e28b 100644
--- a/test/odsign/test-src/com/android/tests/odsign/ActivationTest.java
+++ b/test/odsign/test-src/com/android/tests/odsign/ActivationTest.java
@@ -67,12 +67,17 @@
}
@Test
- public void verifyGeneratedArtifactsLoaded() throws Exception {
- // Checking zygote and system_server need the device have adb root to walk process maps.
+ public void verifyCompilationLogGenerated() throws Exception {
mTestUtils.enableAdbRootOrSkipTest();
// Check there is a compilation log, we expect compilation to have occurred.
assertTrue("Compilation log not found", mTestUtils.haveCompilationLog());
+ }
+
+ @Test
+ public void verifyGeneratedArtifactsLoaded() throws Exception {
+ // Checking zygote and system_server need the device have adb root to walk process maps.
+ mTestUtils.enableAdbRootOrSkipTest();
// Check both zygote and system_server processes to see that they have loaded the
// artifacts compiled and signed by odrefresh and odsign. We check both here rather than
diff --git a/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java b/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
index a04c87b..38eab97 100644
--- a/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
+++ b/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
@@ -117,8 +117,8 @@
assertThat(actualChecksums).isNotEqualTo(originalChecksums);
}
- @Ignore("Override base class. Need to handle compilation log. b/208446270")
- public void verifyGeneratedArtifactsLoaded() {}
+ @Ignore("Compilation log in CompOS isn't useful, and doesn't need to be generated")
+ public void verifyCompilationLogGenerated() {}
private static String checksumDirectoryContentPartial(ITestDevice device, String path)
throws Exception {