Merge "Add the drop_caches_test to the VTS kernel list."
diff --git a/prebuilts/libvtswidevine/arm/libvtswidevine32.so b/prebuilts/libvtswidevine/arm/libvtswidevine32.so
index ee7db0a..bcb3f5a 100755
--- a/prebuilts/libvtswidevine/arm/libvtswidevine32.so
+++ b/prebuilts/libvtswidevine/arm/libvtswidevine32.so
Binary files differ
diff --git a/testcases/host/fastboot_getvar/OWNERS b/testcases/host/fastboot_getvar/OWNERS
index d882e66..0427b50 100644
--- a/testcases/host/fastboot_getvar/OWNERS
+++ b/testcases/host/fastboot_getvar/OWNERS
@@ -1,4 +1,5 @@
# Bug component: 30545
dvander@google.com
-hridya@google.com
+bowgotsai@google.com
+elsk@google.com
smuckle@google.com
diff --git a/testcases/host/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java b/testcases/host/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java
index d693770..7303e6c 100644
--- a/testcases/host/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java
+++ b/testcases/host/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java
@@ -22,6 +22,7 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import android.platform.test.annotations.RequiresDevice;
import com.android.tradefed.device.DeviceProperties;
import com.android.tradefed.device.ITestDevice;
import com.android.tradefed.invoker.TestInformation;
@@ -43,6 +44,7 @@
import org.junit.runner.RunWith;
/* VTS test to verify userspace fastboot getvar information. */
+@RequiresDevice
@RunWith(DeviceJUnit4ClassRunner.class)
public class FastbootGetvarUserspaceTest extends BaseHostJUnit4Test {
private static final int PLATFORM_API_LEVEL_R = 30;
diff --git a/testcases/host/fastboot_test/OWNERS b/testcases/host/fastboot_test/OWNERS
index d882e66..d82cb64 100644
--- a/testcases/host/fastboot_test/OWNERS
+++ b/testcases/host/fastboot_test/OWNERS
@@ -1,4 +1,4 @@
# Bug component: 30545
dvander@google.com
-hridya@google.com
+elsk@google.com
smuckle@google.com
diff --git a/testcases/host/fastboot_test/src/com/android/tests/FastbootVerifyUserspaceTest.java b/testcases/host/fastboot_test/src/com/android/tests/FastbootVerifyUserspaceTest.java
index 9ce968e..f95fc9f 100644
--- a/testcases/host/fastboot_test/src/com/android/tests/FastbootVerifyUserspaceTest.java
+++ b/testcases/host/fastboot_test/src/com/android/tests/FastbootVerifyUserspaceTest.java
@@ -16,8 +16,11 @@
package com.android.tests.fastboot;
+import android.platform.test.annotations.RequiresDevice;
import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.tradefed.device.IManagedTestDevice;
import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.device.TestDeviceState;
import com.android.tradefed.invoker.TestInformation;
import com.android.tradefed.log.LogUtil.CLog;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
@@ -43,10 +46,11 @@
import org.junit.runners.JUnit4;
/* VTS test to verify userspace fastboot implementation. */
+@RequiresDevice
@RunWith(DeviceJUnit4ClassRunner.class)
public class FastbootVerifyUserspaceTest extends BaseHostJUnit4Test {
- // Default maximum command run time is set to 1 minute.
- private static final long MAX_CMD_RUN_TIME = 60000L;
+ // Default maximum command run time is set to 90 seconds.
+ private static final long MAX_CMD_RUN_TIME = 90000L;
private static ITestDevice sDevice;
private static String executeShellKernelARM64 =
@@ -91,6 +95,13 @@
@AfterClassWithInfo
public static void tearDownClass(TestInformation testInfo) throws Exception {
if (!isGKI10) {
+ // Make sure the device state still is FASTBOOTD after the test class have
+ // been executed, because fastboot commands in the tests will disrupt
+ // device state
+ if (!TestDeviceState.FASTBOOTD.equals(testInfo.getDevice().getDeviceState())) {
+ ((IManagedTestDevice) testInfo.getDevice())
+ .setDeviceState(TestDeviceState.FASTBOOTD);
+ }
testInfo.getDevice().reboot(); // back to adb.
}
}
diff --git a/testcases/host/firmware_dtbo_test/OWNERS b/testcases/host/firmware_dtbo_test/OWNERS
index 1e9b5e7..57b1211 100644
--- a/testcases/host/firmware_dtbo_test/OWNERS
+++ b/testcases/host/firmware_dtbo_test/OWNERS
@@ -1,3 +1,2 @@
# Bug component: 30545
-hridya@google.com
smuckle@google.com
diff --git a/testcases/host/firmware_test/OWNERS b/testcases/host/firmware_test/OWNERS
index 95e2d3b..6c6bae8 100644
--- a/testcases/host/firmware_test/OWNERS
+++ b/testcases/host/firmware_test/OWNERS
@@ -1,4 +1,3 @@
# Bug component: 30545
-hridya@google.com
smuckle@google.com
yochiang@google.com
diff --git a/testcases/host/firmware_test/src/com/android/tests/firmware/FirmwareBootHeaderVerification.java b/testcases/host/firmware_test/src/com/android/tests/firmware/FirmwareBootHeaderVerification.java
index 11ec4fc..3105fbc 100644
--- a/testcases/host/firmware_test/src/com/android/tests/firmware/FirmwareBootHeaderVerification.java
+++ b/testcases/host/firmware_test/src/com/android/tests/firmware/FirmwareBootHeaderVerification.java
@@ -76,7 +76,7 @@
}
private boolean isFullfeelPrecondition() throws DeviceNotAvailableException {
- if (mSupportedAbis.contains("x86")) {
+ if (mSupportedAbis.contains("x86") || mSupportedAbis.contains("x86_64")) {
mBlockDevPath = "/dev/block";
String acpio_idx_string = mDevice.getProperty(PROPERTY_ACPIO_IDX);
if (Strings.isNullOrEmpty(acpio_idx_string)) {
