Move libs/libvmbase/example/tests/ under tests/
Extract the test (which consists of a host Rust program running a full
payload) outside of the library into its own standalone directory.
No functional change intended.
Bug: 352458998
Test: m vmbase_example.integration_test
Change-Id: I367964ccbf85774545a78e442501321183f98ba3
diff --git a/TEST_MAPPING b/TEST_MAPPING
index fc88a59..2112125 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -144,7 +144,7 @@
"path": "packages/modules/Virtualization/android/vm"
},
{
- "path": "packages/modules/Virtualization/libs/libvmbase"
+ "path": "packages/modules/Virtualization/tests/vmbase_example"
},
{
"path": "packages/modules/Virtualization/guest/zipfuse"
diff --git a/libs/libvmbase/example/Android.bp b/libs/libvmbase/example/Android.bp
index fe9de44..630cee6 100644
--- a/libs/libvmbase/example/Android.bp
+++ b/libs/libvmbase/example/Android.bp
@@ -45,30 +45,3 @@
},
},
}
-
-rust_test {
- name: "vmbase_example.integration_test",
- crate_name: "vmbase_example_test",
- srcs: ["tests/test.rs"],
- prefer_rlib: true,
- edition: "2021",
- rustlibs: [
- "android.system.virtualizationservice-rust",
- "libandroid_logger",
- "libanyhow",
- "liblibc",
- "liblog_rust",
- "libnix",
- "libvmclient",
- ],
- data: [
- ":vmbase_example_bin",
- ],
- test_suites: ["general-tests"],
- enabled: false,
- target: {
- android_arm64: {
- enabled: true,
- },
- },
-}
diff --git a/tests/vmbase_example/Android.bp b/tests/vmbase_example/Android.bp
new file mode 100644
index 0000000..6e902b1
--- /dev/null
+++ b/tests/vmbase_example/Android.bp
@@ -0,0 +1,30 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+rust_test {
+ name: "vmbase_example.integration_test",
+ crate_name: "vmbase_example_test",
+ srcs: ["src/main.rs"],
+ prefer_rlib: true,
+ edition: "2021",
+ rustlibs: [
+ "android.system.virtualizationservice-rust",
+ "libandroid_logger",
+ "libanyhow",
+ "liblibc",
+ "liblog_rust",
+ "libnix",
+ "libvmclient",
+ ],
+ data: [
+ ":vmbase_example_bin",
+ ],
+ test_suites: ["general-tests"],
+ enabled: false,
+ target: {
+ android_arm64: {
+ enabled: true,
+ },
+ },
+}
diff --git a/libs/libvmbase/example/tests/test.rs b/tests/vmbase_example/src/main.rs
similarity index 100%
rename from libs/libvmbase/example/tests/test.rs
rename to tests/vmbase_example/src/main.rs