Enable tests am: 5f46350afa am: f099452010
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/async-stream/+/2262041
Change-Id: I94f93114795af68efc8230b99962f048fa50b953
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index d48bba7..2745963 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,47 @@
],
}
+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 @@
"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"
+ ]
+}
