diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2022-10-19 19:49:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-19 19:49:46 +0000 |
commit | ae065b55e76923821714846b917462b95a652b1c (patch) | |
tree | 89d6ea4683429b4a3896de25d3089db428a3be3d | |
parent | 2d43529f4a06aaa2c43e6546cfc20ddc731e58a3 (diff) | |
parent | b7f220b8ddbf2c311b8543e148571be57ba14734 (diff) | |
download | async-stream-ae065b55e76923821714846b917462b95a652b1c.tar.gz |
Enable tests am: 5f46350afa am: f099452010 am: b7f220b8dd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/async-stream/+/2262041
Change-Id: I0d87e6a9672192ad70ce92265bf4e71ee1b2d26f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 45 | ||||
-rw-r--r-- | TEST_MAPPING | 16 | ||||
-rw-r--r-- | cargo2android.json | 11 |
3 files changed, 70 insertions, 2 deletions
@@ -18,6 +18,47 @@ license { ], } +rust_defaults { + name: "async-stream_test_defaults", + crate_name: "async_stream", + cargo_env_compat: true, + cargo_pkg_version: "0.3.3", + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2018", + rustlibs: [ + "libasync_stream", + "libfutures_core", + "libfutures_util", + "libtokio", + "libtokio_test", + ], + proc_macros: [ + "libasync_stream_impl", + "librustversion", + ], +} + +rust_test { + name: "async-stream_test_tests_for_await", + defaults: ["async-stream_test_defaults"], + host_supported: true, + srcs: ["tests/for_await.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "async-stream_test_tests_try_stream", + defaults: ["async-stream_test_defaults"], + host_supported: true, + srcs: ["tests/try_stream.rs"], + test_options: { + unit_test: true, + }, +} + rust_library { name: "libasync_stream", host_supported: true, @@ -30,4 +71,8 @@ rust_library { "libfutures_core", ], proc_macros: ["libasync_stream_impl"], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], } diff --git a/TEST_MAPPING b/TEST_MAPPING index dfc3524..0d50c8f 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -7,5 +7,21 @@ { "path": "external/rust/crates/tokio-test" } + ], + "presubmit": [ + { + "name": "async-stream_test_tests_for_await" + }, + { + "name": "async-stream_test_tests_try_stream" + } + ], + "presubmit-rust": [ + { + "name": "async-stream_test_tests_for_await" + }, + { + "name": "async-stream_test_tests_try_stream" + } ] } diff --git a/cargo2android.json b/cargo2android.json index bf78496..0c66159 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,4 +1,11 @@ { "device": true, - "run": true -}
\ No newline at end of file + "run": true, + "tests": true, + "dependency-blocklist": [ + "trybuild" + ], + "test-blocklist": [ + "tests/stream.rs" + ] +} |