Merge "Add vm subcommand to check support for protected and unprotected VMs."
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 7be81a8..6338c82 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,7 +7,7 @@
"name": "ComposHostTestCases"
},
{
- "name": "VirtualizationTestCases.64"
+ "name": "VirtualizationTestCases"
},
{
"name": "MicrodroidTestApp"
diff --git a/authfs/tests/Android.bp b/authfs/tests/Android.bp
index 1b5cf09..30606e5 100644
--- a/authfs/tests/Android.bp
+++ b/authfs/tests/Android.bp
@@ -15,7 +15,6 @@
],
test_suites: ["general-tests"],
data_device_bins: ["open_then_run"],
- per_testcase_directory: true,
data: [
":authfs_test_files",
":MicrodroidTestApp",
diff --git a/compos/tests/Android.bp b/compos/tests/Android.bp
index c178ddd..d380059 100644
--- a/compos/tests/Android.bp
+++ b/compos/tests/Android.bp
@@ -13,7 +13,5 @@
static_libs: [
"VirtualizationTestHelper",
],
- test_suites: [
- "general-tests",
- ],
+ test_suites: ["general-tests"],
}
diff --git a/docs/getting_started/index.md b/docs/getting_started/index.md
index ac5d38b..6d3b208 100644
--- a/docs/getting_started/index.md
+++ b/docs/getting_started/index.md
@@ -36,7 +36,7 @@
all can run via `atest`.
```shell
-atest VirtualizationTestCases.64
+atest VirtualizationTestCases
atest MicrodroidHostTestCases
atest MicrodroidTestApp
```
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 7384cef..a93a801 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -292,18 +292,24 @@
avb_private_key: ":microdroid_sign_key",
}
-android_filesystem {
- name: "microdroid_vendor_ramdisk-5.10",
+prebuilt_kernel_modules {
+ name: "microdroid_kernel_modules",
arch: {
arm64: {
- deps: ["virt_device_prebuilts_kernel_modules-5.10-arm64"],
+ srcs: [":virt_device_prebuilts_kernel_modules_microdroid-5.10-arm64"],
},
x86_64: {
- deps: ["virt_device_prebuilts_kernel_modules-5.10-x86_64"],
+ srcs: [":virt_device_prebuilts_kernel_modules_microdroid-5.10-x86_64"],
},
},
+ kernel_version: "5.10",
+}
+
+android_filesystem {
+ name: "microdroid_vendor_ramdisk-5.10",
deps: [
"microdroid_fstab",
+ "microdroid_kernel_modules",
],
base_dir: "first_stage_ramdisk",
type: "compressed_cpio",
diff --git a/tests/Android.bp b/tests/Android.bp
index 58cc06f..35ff6a0 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -19,16 +19,10 @@
kernel_version = "5.10"
kernel_stem = "kernel_prebuilts-" + kernel_version
-kernel_modules_stem = "virt_device_prebuilts_kernel_modules-" + kernel_version
cc_test {
- // ".64" suffix is to work around cts-unit-test which is demanding that all
- // executables in CTS should have both 32 and 64 ABIs.
- name: "VirtualizationTestCases.64",
- test_suites: [
- "cts",
- "general-tests",
- ],
+ name: "VirtualizationTestCases",
+ test_suites: ["general-tests"],
srcs: [
"common.cc",
"vsock_test.cc",
@@ -85,15 +79,8 @@
android_filesystem {
name: "virt_test_initramfs",
- arch: {
- arm64: {
- deps: [kernel_modules_stem + "-arm64"],
- },
- x86_64: {
- deps: [kernel_modules_stem + "-x86_64"],
- },
- },
deps: [
+ "microdroid_kernel_modules",
"virt_test_guest_init",
"virt_test_vsock_guest",
],
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 68e9c1b..5e7faf9 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -15,16 +15,11 @@
-->
<configuration description="Config for Virtualization tests">
- <option name="test-suite-tag" value="cts" />
- <option name="config-descriptor:metadata" key="component" value="security" />
- <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
- <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
- <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
<!-- Push test binaries to the device. -->
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<option name="abort-on-push-failure" value="true" />
- <option name="push-file" key="VirtualizationTestCases.64" value="/data/local/tmp/virt-test/VirtualizationTestCases.64" />
+ <option name="push-file" key="VirtualizationTestCases" value="/data/local/tmp/virt-test/VirtualizationTestCases" />
<option name="push-file" key="virt_test_kernel" value="/data/local/tmp/virt-test/kernel" />
<option name="push-file" key="virt_test_initramfs.img" value="/data/local/tmp/virt-test/initramfs" />
</target_preparer>
@@ -35,7 +30,7 @@
<test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp/virt-test" />
- <option name="module-name" value="VirtualizationTestCases.64" />
+ <option name="module-name" value="VirtualizationTestCases" />
<!-- test-timeout unit is ms, value = 2 minutes -->
<option name="native-test-timeout" value="120000" />
</test>
diff --git a/tests/hostside/Android.bp b/tests/hostside/Android.bp
index bc8a4a5..1aef796 100644
--- a/tests/hostside/Android.bp
+++ b/tests/hostside/Android.bp
@@ -5,16 +5,12 @@
java_test_host {
name: "MicrodroidHostTestCases",
srcs: ["java/**/*.java"],
- test_suites: [
- "cts",
- "general-tests",
- ],
+ test_suites: ["general-tests"],
libs: [
"tradefed",
],
static_libs: [
"VirtualizationTestHelper",
],
- per_testcase_directory: true,
data: [":MicrodroidTestApp"],
}
diff --git a/tests/hostside/AndroidTest.xml b/tests/hostside/AndroidTest.xml
index 79428ce..e8aced6 100644
--- a/tests/hostside/AndroidTest.xml
+++ b/tests/hostside/AndroidTest.xml
@@ -14,11 +14,6 @@
limitations under the License.
-->
<configuration description="Tests for microdroid">
- <option name="test-suite-tag" value="cts" />
- <option name="config-descriptor:metadata" key="component" value="security" />
- <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
- <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
- <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="MicrodroidHostTestCases.jar" />
</test>
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 0699e3d..a8b068c 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -4,10 +4,7 @@
android_test {
name: "MicrodroidTestApp",
- test_suites: [
- "cts",
- "general-tests",
- ],
+ test_suites: ["general-tests"],
srcs: ["src/java/**/*.java"],
static_libs: [
"androidx.test.runner",
@@ -19,8 +16,6 @@
jni_libs: ["MicrodroidTestNativeLib"],
platform_apis: true,
use_embedded_native_libs: true,
- // We only support 64-bit ABI, but CTS demands all APKs to be multi-ABI.
- compile_multilib: "both",
}
// TODO(jiyong): make this a binary, not a shared library
diff --git a/tests/testapk/AndroidTest.xml b/tests/testapk/AndroidTest.xml
index e8bb1aa..c7097db 100644
--- a/tests/testapk/AndroidTest.xml
+++ b/tests/testapk/AndroidTest.xml
@@ -14,12 +14,7 @@
limitations under the License.
-->
<configuration description="Runs sample instrumentation test.">
- <option name="test-suite-tag" value="cts" />
- <option name="config-descriptor:metadata" key="component" value="security" />
- <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
- <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
- <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
- <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
<option name="test-file-name" value="MicrodroidTestApp.apk" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">