Merge "Remove support for command-line args"
diff --git a/authfs/tests/java/src/com/android/fs/AuthFsBenchmarks.java b/authfs/tests/java/src/com/android/fs/AuthFsBenchmarks.java
index f84785b..af2c892 100644
--- a/authfs/tests/java/src/com/android/fs/AuthFsBenchmarks.java
+++ b/authfs/tests/java/src/com/android/fs/AuthFsBenchmarks.java
@@ -33,6 +33,7 @@
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
import com.android.tradefed.testtype.junit4.BeforeClassWithInfo;
+import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -64,7 +65,7 @@
@BeforeClassWithInfo
public static void beforeClassWithDevice(TestInformation testInfo) throws Exception {
- AuthFsTestRule.setUpClass(testInfo);
+ AuthFsTestRule.setUpAndroid(testInfo);
}
@Before
@@ -73,12 +74,17 @@
MetricsProcessor.getMetricPrefix(
getDevice().getProperty("debug.hypervisor.metrics_tag"));
mMetricsProcessor = new MetricsProcessor(metricsPrefix + "authfs/");
+ AuthFsTestRule.startMicrodroid();
+ }
+
+ @After
+ public void tearDown() throws DeviceNotAvailableException {
+ AuthFsTestRule.shutdownMicrodroid();
}
@AfterClassWithInfo
- public static void afterClassWithDevice(TestInformation testInfo)
- throws DeviceNotAvailableException {
- AuthFsTestRule.tearDownClass(testInfo);
+ public static void afterClassWithDevice(TestInformation testInfo) {
+ AuthFsTestRule.tearDownAndroid();
}
@Test
diff --git a/authfs/tests/java/src/com/android/fs/AuthFsHostTest.java b/authfs/tests/java/src/com/android/fs/AuthFsHostTest.java
index 14dc88b..c4169f6 100644
--- a/authfs/tests/java/src/com/android/fs/AuthFsHostTest.java
+++ b/authfs/tests/java/src/com/android/fs/AuthFsHostTest.java
@@ -72,7 +72,8 @@
@BeforeClassWithInfo
public static void beforeClassWithDevice(TestInformation testInfo) throws Exception {
- AuthFsTestRule.setUpClass(testInfo);
+ AuthFsTestRule.setUpAndroid(testInfo);
+ AuthFsTestRule.startMicrodroid();
sAndroid = AuthFsTestRule.getAndroid();
sMicrodroid = AuthFsTestRule.getMicrodroid();
}
@@ -80,7 +81,8 @@
@AfterClassWithInfo
public static void afterClassWithDevice(TestInformation testInfo)
throws DeviceNotAvailableException {
- AuthFsTestRule.tearDownClass(testInfo);
+ AuthFsTestRule.shutdownMicrodroid();
+ AuthFsTestRule.tearDownAndroid();
}
@Test
diff --git a/authfs/tests/java/src/com/android/fs/AuthFsTestRule.java b/authfs/tests/java/src/com/android/fs/AuthFsTestRule.java
index 045ecc0..a9fdd10 100644
--- a/authfs/tests/java/src/com/android/fs/AuthFsTestRule.java
+++ b/authfs/tests/java/src/com/android/fs/AuthFsTestRule.java
@@ -91,7 +91,7 @@
private final ExecutorService mThreadPool = Executors.newCachedThreadPool();
- static void setUpClass(TestInformation testInfo) throws Exception {
+ static void setUpAndroid(TestInformation testInfo) throws Exception {
assertNotNull(testInfo.getDevice());
if (!(testInfo.getDevice() instanceof TestDevice)) {
CLog.w("Unexpected type of ITestDevice. Skipping.");
@@ -108,35 +108,9 @@
CLog.i("Microdroid not supported. Skipping.");
return;
}
-
- // For each test case, boot and adb connect to a new Microdroid
- CLog.i("Starting the shared VM");
- sMicrodroidDevice =
- MicrodroidBuilder.fromFile(
- findTestFile(testInfo.getBuildInfo(), TEST_APK_NAME),
- VM_CONFIG_PATH_IN_APK)
- .debugLevel("full")
- .build((TestDevice) androidDevice);
-
- // From this point on, we need to tear down the Microdroid instance
- sMicrodroid = new CommandRunner(sMicrodroidDevice);
-
- sMicrodroid.runForResult("mkdir -p " + MOUNT_DIR);
-
- // Root because authfs (started from shell in this test) currently require root to open
- // /dev/fuse and mount the FUSE.
- assertThat(sMicrodroidDevice.enableAdbRoot()).isTrue();
}
- static void tearDownClass(TestInformation testInfo) throws DeviceNotAvailableException {
- assertNotNull(sAndroid);
-
- if (sMicrodroid != null) {
- CLog.i("Shutting down shared VM");
- ((TestDevice) testInfo.getDevice()).shutdownMicrodroid(sMicrodroid.getDevice());
- sMicrodroid = null;
- }
-
+ static void tearDownAndroid() {
sAndroid = null;
}
@@ -157,6 +131,33 @@
return sMicrodroidDevice;
}
+ static void startMicrodroid() throws DeviceNotAvailableException {
+ CLog.i("Starting the shared VM");
+ assertThat(sMicrodroidDevice).isNull();
+ sMicrodroidDevice =
+ MicrodroidBuilder.fromFile(
+ findTestFile(sTestInfo.getBuildInfo(), TEST_APK_NAME),
+ VM_CONFIG_PATH_IN_APK)
+ .debugLevel("full")
+ .build(getDevice());
+
+ // From this point on, we need to tear down the Microdroid instance
+ sMicrodroid = new CommandRunner(sMicrodroidDevice);
+
+ sMicrodroid.runForResult("mkdir -p " + MOUNT_DIR);
+
+ // Root because authfs (started from shell in this test) currently require root to open
+ // /dev/fuse and mount the FUSE.
+ assertThat(sMicrodroidDevice.enableAdbRoot()).isTrue();
+ }
+
+ static void shutdownMicrodroid() throws DeviceNotAvailableException {
+ assertNotNull(sMicrodroidDevice);
+ getDevice().shutdownMicrodroid(sMicrodroidDevice);
+ sMicrodroidDevice = null;
+ sMicrodroid = null;
+ }
+
@Override
public Statement apply(final Statement base, Description description) {
return super.apply(
diff --git a/libs/nested_virt/src/lib.rs b/libs/nested_virt/src/lib.rs
index ab1f06a..b43fcb7 100644
--- a/libs/nested_virt/src/lib.rs
+++ b/libs/nested_virt/src/lib.rs
@@ -23,9 +23,9 @@
pub fn is_nested_virtualization() -> Result<bool> {
// Currently nested virtualization only occurs when we run KVM inside the cuttlefish VM.
// So we just need to check for vsoc.
- if let Some(value) = system_properties::read("ro.build.product")? {
+ if let Some(value) = system_properties::read("ro.product.vendor.device")? {
// Fuzzy matching to allow for vsoc_x86, vsoc_x86_64, vsoc_x86_64_only, ...
- Ok(value.starts_with("vsoc_x86"))
+ Ok(value.starts_with("vsoc_"))
} else {
Ok(false)
}
diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
index c2fd295..3052c85 100644
--- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
+++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -49,7 +49,8 @@
public abstract class MicrodroidDeviceTestBase {
public static boolean isCuttlefish() {
- return VirtualizationTestHelper.isCuttlefish(SystemProperties.get("ro.product.name"));
+ return VirtualizationTestHelper.isCuttlefish(
+ SystemProperties.get("ro.product.vendor.device"));
}
public static String getMetricPrefix() {
diff --git a/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java b/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java
index c6c0ad0..4c27915 100644
--- a/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java
+++ b/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java
@@ -16,11 +16,7 @@
package com.android.virt;
public abstract class VirtualizationTestHelper {
- public static boolean isCuttlefish(String productName) {
- return (null != productName)
- && (productName.startsWith("aosp_cf_x86")
- || productName.startsWith("aosp_cf_arm")
- || productName.startsWith("cf_x86")
- || productName.startsWith("cf_arm"));
+ public static boolean isCuttlefish(String vendorDeviceName) {
+ return vendorDeviceName != null && vendorDeviceName.startsWith("vsoc_");
}
}
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
index 2df829c..6346288 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
@@ -95,7 +95,8 @@
}
protected boolean isCuttlefish() throws Exception {
- return VirtualizationTestHelper.isCuttlefish(getDevice().getProperty("ro.product.name"));
+ return VirtualizationTestHelper.isCuttlefish(
+ getDevice().getProperty("ro.product.vendor.device"));
}
protected String getMetricPrefix() throws Exception {