commit db1e707d1ed8e4f70ba4af00d9f87f0012875499
author Jeff Vander Stoep <jeffv@google.com> Mon Oct 18 13:46:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 18 13:46:28 2021 +0000
tree 5866cf58f9775e6537b5074883cf645fac6c372c
parent dfab1ecd8b65f383a7a23c37cc338c7fa03c3d00
parent 55a8a496662d3fb0b6d151bba0e4dba200c12df5

Enable tests in Android CI am: 55a8a49666

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/arbitrary/+/1859216

Change-Id: I1373256960b39c75caeb94cc09a4e146f4e9175f

Android.bp

diff --git a/Android.bp b/Android.bp
index 16816a1..bdf5cd6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,6 +37,83 @@
     ],
 }
 
+rust_defaults {
+    name: "arbitrary_test_defaults",
+    crate_name: "arbitrary",
+    srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.2",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "derive",
+        "derive_arbitrary",
+    ],
+    proc_macros: ["libderive_arbitrary"],
+}
+
+rust_test_host {
+    name: "arbitrary_host_test_src_lib",
+    defaults: ["arbitrary_test_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "arbitrary_device_test_src_lib",
+    defaults: ["arbitrary_test_defaults"],
+}
+
+rust_defaults {
+    name: "arbitrary_test_defaults_arbitrary",
+    crate_name: "arbitrary",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.2",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "derive",
+        "derive_arbitrary",
+    ],
+    rustlibs: [
+        "libarbitrary",
+    ],
+    proc_macros: ["libderive_arbitrary"],
+}
+
+rust_test_host {
+    name: "arbitrary_host_test_tests_derive",
+    defaults: ["arbitrary_test_defaults_arbitrary"],
+    srcs: ["tests/derive.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "arbitrary_device_test_tests_derive",
+    defaults: ["arbitrary_test_defaults_arbitrary"],
+    srcs: ["tests/derive.rs"],
+}
+
+rust_test_host {
+    name: "arbitrary_host_test_tests_path",
+    defaults: ["arbitrary_test_defaults_arbitrary"],
+    srcs: ["tests/path.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "arbitrary_device_test_tests_path",
+    defaults: ["arbitrary_test_defaults_arbitrary"],
+    srcs: ["tests/path.rs"],
+}
+
 rust_library_rlib {
     name: "libarbitrary",
     host_supported: true,

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..75be883
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,14 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "presubmit": [
+    {
+      "name": "arbitrary_device_test_src_lib"
+    },
+    {
+      "name": "arbitrary_device_test_tests_derive"
+    },
+    {
+      "name": "arbitrary_device_test_tests_path"
+    }
+  ]
+}

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index af31ee9..c586b5e 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -3,5 +3,6 @@
   "device": true,
   "features": "derive",
   "force-rlib": true,
-  "run": true
-}
\ No newline at end of file
+  "run": true,
+  "tests": true
+}