diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2022-07-26 22:17:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-26 22:17:41 +0000 |
| commit | 527d3d0f6cb8561901a1fd4523038004c45d1502 (patch) | |
| tree | 870e95ec3f9afcf9e1335a32813740e8f76fa82a | |
| parent | 4b343210e40d51ea2592647d71a2e89ab014d4f7 (diff) | |
| parent | 7a098bf6df6a3b23e012a3eb486200d7b0fbcf70 (diff) | |
| download | hashlink-527d3d0f6cb8561901a1fd4523038004c45d1502.tar.gz | |
Enable tests am: e65a0e9359 am: 7a098bf6df
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/hashlink/+/2166502
Change-Id: I39b4c37e04292fcb339e85c93058040815fd7ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 70 | ||||
| -rw-r--r-- | TEST_MAPPING | 24 | ||||
| -rw-r--r-- | cargo2android.json | 5 |
3 files changed, 97 insertions, 2 deletions
@@ -37,6 +37,72 @@ license { ], } +rust_test { + name: "hashlink_test_src_lib", + host_supported: true, + crate_name: "hashlink", + cargo_env_compat: true, + cargo_pkg_version: "0.7.0", + srcs: ["src/lib.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, + test_options: { + unit_test: true, + }, + edition: "2018", + rustlibs: [ + "libfxhash", + "libhashbrown", + "libserde_test", + ], +} + +rust_defaults { + name: "hashlink_test_defaults", + crate_name: "hashlink", + cargo_env_compat: true, + cargo_pkg_version: "0.7.0", + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2018", + rustlibs: [ + "libfxhash", + "libhashbrown", + "libhashlink", + "libserde_test", + ], +} + +rust_test { + name: "hashlink_test_tests_linked_hash_map", + defaults: ["hashlink_test_defaults"], + host_supported: true, + srcs: ["tests/linked_hash_map.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "hashlink_test_tests_linked_hash_set", + defaults: ["hashlink_test_defaults"], + host_supported: true, + srcs: ["tests/linked_hash_set.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "hashlink_test_tests_lru_cache", + defaults: ["hashlink_test_defaults"], + host_supported: true, + srcs: ["tests/lru_cache.rs"], + test_options: { + unit_test: true, + }, +} + rust_library { name: "libhashlink", host_supported: true, @@ -48,4 +114,8 @@ rust_library { rustlibs: [ "libhashbrown", ], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], } diff --git a/TEST_MAPPING b/TEST_MAPPING index aa301aa..31412aa 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,6 +2,18 @@ { "presubmit": [ { + "name": "hashlink_test_src_lib" + }, + { + "name": "hashlink_test_tests_linked_hash_map" + }, + { + "name": "hashlink_test_tests_linked_hash_set" + }, + { + "name": "hashlink_test_tests_lru_cache" + }, + { "name": "keystore2_legacy_blobs_test" }, { @@ -13,6 +25,18 @@ ], "presubmit-rust": [ { + "name": "hashlink_test_src_lib" + }, + { + "name": "hashlink_test_tests_linked_hash_map" + }, + { + "name": "hashlink_test_tests_linked_hash_set" + }, + { + "name": "hashlink_test_tests_lru_cache" + }, + { "name": "keystore2_legacy_blobs_test" }, { diff --git a/cargo2android.json b/cargo2android.json index bf78496..ff6df50 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,4 +1,5 @@ { "device": true, - "run": true -}
\ No newline at end of file + "run": true, + "tests": true +} |