aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2021-10-28 20:42:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-28 20:42:20 +0000
commit24c95aca462699305dbea62444d4420454408d40 (patch)
tree6451c178fd78b37754d01bf4ee0c1ee8f02e3fd9
parentad2a75412f2062e34a2a3d9a1ed6154ecf69c2b9 (diff)
parentacd089d82720e1021602efb804df15930ca17c78 (diff)
downloadtinyvec-24c95aca462699305dbea62444d4420454408d40.tar.gz
Enable tests am: 7080eb50e9 am: 0baa715950 am: acd089d827
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinyvec/+/1863060 Change-Id: I457d5b63390ff611b300adbac56e4e41c602cc8d
-rw-r--r--Android.bp55
-rw-r--r--TEST_MAPPING6
-rw-r--r--cargo2android.json5
3 files changed, 64 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 30327d3..c3e5a0d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,3 +61,58 @@ rust_library {
],
min_sdk_version: "29",
}
+
+rust_defaults {
+ name: "tinyvec_test_defaults",
+ crate_name: "tinyvec",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.4.0",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2018",
+ features: [
+ "alloc",
+ "default",
+ "tinyvec_macros",
+ ],
+ flags: [
+ "-C debug-assertions=on",
+ "-C opt-level=3",
+ ],
+ rustlibs: [
+ "libcriterion",
+ "libserde_test",
+ "libtinyvec",
+ "libtinyvec_macros",
+ ],
+}
+
+rust_test_host {
+ name: "tinyvec_host_test_tests_arrayvec",
+ defaults: ["tinyvec_test_defaults"],
+ srcs: ["tests/arrayvec.rs"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
+rust_test {
+ name: "tinyvec_device_test_tests_arrayvec",
+ defaults: ["tinyvec_test_defaults"],
+ srcs: ["tests/arrayvec.rs"],
+}
+
+rust_test_host {
+ name: "tinyvec_host_test_tests_tinyvec",
+ defaults: ["tinyvec_test_defaults"],
+ srcs: ["tests/tinyvec.rs"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
+rust_test {
+ name: "tinyvec_device_test_tests_tinyvec",
+ defaults: ["tinyvec_test_defaults"],
+ srcs: ["tests/tinyvec.rs"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index bf91080..e448918 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -8,6 +8,12 @@
"name": "quiche_device_test_src_lib"
},
{
+ "name": "tinyvec_device_test_tests_arrayvec"
+ },
+ {
+ "name": "tinyvec_device_test_tests_tinyvec"
+ },
+ {
"name": "unicode-normalization_device_test_src_lib"
},
{
diff --git a/cargo2android.json b/cargo2android.json
index 9b0c9be..b86e1c0 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,5 +7,6 @@
"dependencies": true,
"features": "alloc,default,tinyvec_macros",
"device": true,
- "run": true
-} \ No newline at end of file
+ "run": true,
+ "tests": true
+}