aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2022-10-14 18:09:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-14 18:09:24 +0000
commit7311d351c842ccde601e12bc77f3143dcf4a4496 (patch)
tree7c519b20e1ed5fb5d2bf5e0d10a6d2c64ad474b4
parenta12885877ea4e729733a9e627daabfd63a6789a9 (diff)
parent206531b4d4b6dd4116ff7009cf75f9778a4ed5dd (diff)
downloadhashbrown-7311d351c842ccde601e12bc77f3143dcf4a4496.tar.gz
Enable tests am: e565d8fdb7 am: 897366980d am: 206531b4d4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/hashbrown/+/2255340 Change-Id: Ib4551bc0e4546b515e93250e06e963081267ea13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp74
-rw-r--r--TEST_MAPPING29
-rw-r--r--cargo2android.json8
3 files changed, 109 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 9a78fe9..086faa1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,6 +37,80 @@ license {
],
}
+rust_test {
+ name: "hashbrown_test_src_lib",
+ host_supported: true,
+ crate_name: "hashbrown",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.12.3",
+ srcs: ["src/lib.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
+ edition: "2021",
+ features: [
+ "ahash",
+ "default",
+ "inline-more",
+ "raw",
+ ],
+ rustlibs: [
+ "libahash",
+ "libfnv",
+ "liblazy_static",
+ "librand",
+ "librayon",
+ "libserde_test",
+ ],
+}
+
+rust_defaults {
+ name: "hashbrown_test_defaults",
+ crate_name: "hashbrown",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.12.3",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2021",
+ features: [
+ "ahash",
+ "default",
+ "inline-more",
+ "raw",
+ ],
+ rustlibs: [
+ "libahash",
+ "libfnv",
+ "libhashbrown",
+ "liblazy_static",
+ "librand",
+ "librayon",
+ "libserde_test",
+ ],
+}
+
+rust_test {
+ name: "hashbrown_test_tests_hasher",
+ defaults: ["hashbrown_test_defaults"],
+ host_supported: true,
+ srcs: ["tests/hasher.rs"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
+rust_test {
+ name: "hashbrown_test_tests_set",
+ defaults: ["hashbrown_test_defaults"],
+ host_supported: true,
+ srcs: ["tests/set.rs"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
rust_library {
name: "libhashbrown",
host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e3e692f..408073e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,7 +1,24 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/hashlink"
+ }
+ ],
"presubmit": [
{
+ "name": "ZipFuseTest"
+ },
+ {
+ "name": "apkdmverity.test"
+ },
+ {
+ "name": "authfs_device_test_src_lib"
+ },
+ {
+ "name": "avmdtool_tests"
+ },
+ {
"name": "hashbrown_test_src_lib"
},
{
@@ -22,6 +39,18 @@
],
"presubmit-rust": [
{
+ "name": "ZipFuseTest"
+ },
+ {
+ "name": "apkdmverity.test"
+ },
+ {
+ "name": "authfs_device_test_src_lib"
+ },
+ {
+ "name": "avmdtool_tests"
+ },
+ {
"name": "hashbrown_test_src_lib"
},
{
diff --git a/cargo2android.json b/cargo2android.json
index ee68753..4afc81f 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,9 @@
{
"device": true,
"features": "ahash,default,inline-more,raw",
- "run": true
-} \ No newline at end of file
+ "run": true,
+ "tests": true,
+ "dependency-blocklist": [
+ "doc_comment"
+ ]
+}