From df370830ebeb4f8cbabd1f026627d618e31249a9 Mon Sep 17 00:00:00 2001
From: Jeff Vander Stoep <jeffv@google.com>
Date: Tue, 19 Oct 2021 18:53:18 +0200
Subject: Enable tests

Test: atest
-------
x86_64 serde_host_test_src_lib: Passed: 1, Failed: 0, Ignored: 0, Assumption Failed: 0,
x86 serde_device_test_src_lib: Passed: 1, Failed: 0, Ignored: 0, Assumption Failed: 0,

Change-Id: I0d171b794d499cc6462fb3ef938fdc4216e7c11e
---
 Android.bp         | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 TEST_MAPPING       | 53 +++++++++++++++++++++++++++++++++++++++++++----------
 cargo2android.json |  5 +++--
 3 files changed, 94 insertions(+), 12 deletions(-)

diff --git a/Android.bp b/Android.bp
index ddeb344..4269525 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,3 +75,51 @@ rust_library {
         "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,22 +2,55 @@
 {
   "presubmit": [
     {
-      "name": "ZipFuseTest"
+      "name": "base64_device_test_tests_decode"
     },
     {
-      "name": "apkdmverity.test"
+      "name": "base64_device_test_tests_encode"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "name": "base64_device_test_tests_helpers"
     },
     {
-      "name": "base64_device_test_tests_decode"
+      "name": "bitflags_device_test_src_lib"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "name": "bitflags_device_test_tests_basic"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "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"
@@ -64,6 +97,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
+}
-- 
cgit v1.2.3