Enable tests am: df370830eb am: ac14b27a26 am: 87fb0c7b3a am: 69e8f06de7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde/+/1862994
Change-Id: I8fed3a087eb8f13592678b8bf1542a49d82d3d15
diff --git a/Android.bp b/Android.bp
index ddeb344..4269525 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,3 +75,51 @@
"com.android.virt",
],
}
+
+rust_defaults {
+ name: "serde_test_defaults",
+ crate_name: "serde",
+ srcs: ["src/lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.0.130",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2015",
+ features: [
+ "default",
+ "derive",
+ "serde_derive",
+ "std",
+ ],
+ cfgs: [
+ "core_duration",
+ "core_reverse",
+ "core_try_from",
+ "de_boxed_c_str",
+ "de_boxed_path",
+ "de_rc_dst",
+ "integer128",
+ "iterator_try_fold",
+ "num_nonzero",
+ "num_nonzero_signed",
+ "ops_bound",
+ "range_inclusive",
+ "serde_derive",
+ "std_atomic",
+ "systemtime_checked_add",
+ ],
+ proc_macros: ["libserde_derive"],
+}
+
+rust_test_host {
+ name: "serde_host_test_src_lib",
+ defaults: ["serde_test_defaults"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
+rust_test {
+ name: "serde_device_test_src_lib",
+ defaults: ["serde_test_defaults"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 3c29f5b..5d1f043 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,15 +2,6 @@
{
"presubmit": [
{
- "name": "ZipFuseTest"
- },
- {
- "name": "apkdmverity.test"
- },
- {
- "name": "authfs_device_test_src_lib"
- },
- {
"name": "base64_device_test_tests_decode"
},
{
@@ -20,6 +11,48 @@
"name": "base64_device_test_tests_helpers"
},
{
+ "name": "bitflags_device_test_src_lib"
+ },
+ {
+ "name": "bitflags_device_test_tests_basic"
+ },
+ {
+ "name": "bytes_device_test_src_lib"
+ },
+ {
+ "name": "bytes_device_test_tests_test_buf"
+ },
+ {
+ "name": "bytes_device_test_tests_test_buf_mut"
+ },
+ {
+ "name": "bytes_device_test_tests_test_bytes"
+ },
+ {
+ "name": "bytes_device_test_tests_test_bytes_odd_alloc"
+ },
+ {
+ "name": "bytes_device_test_tests_test_bytes_vec_alloc"
+ },
+ {
+ "name": "bytes_device_test_tests_test_chain"
+ },
+ {
+ "name": "bytes_device_test_tests_test_debug"
+ },
+ {
+ "name": "bytes_device_test_tests_test_iter"
+ },
+ {
+ "name": "bytes_device_test_tests_test_reader"
+ },
+ {
+ "name": "bytes_device_test_tests_test_serde"
+ },
+ {
+ "name": "bytes_device_test_tests_test_take"
+ },
+ {
"name": "either_device_test_src_lib"
},
{
@@ -32,7 +65,7 @@
"name": "legacykeystore_test"
},
{
- "name": "microdroid_manager_test"
+ "name": "rand_chacha_device_test_src_lib"
},
{
"name": "serde-xml-rs_device_test_src_lib"
@@ -65,6 +98,9 @@
"name": "serde_cbor_device_test_tests_value"
},
{
+ "name": "serde_device_test_src_lib"
+ },
+ {
"name": "serde_test_device_test_src_lib"
},
{
@@ -93,9 +129,6 @@
},
{
"name": "url_device_test_tests_unit"
- },
- {
- "name": "virtualizationservice_device_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 528d432..9340179 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -9,5 +9,6 @@
"dependencies": true,
"device": true,
"features": "default,derive",
- "run": true
-}
\ No newline at end of file
+ "run": true,
+ "tests": true
+}
