diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-20 18:09:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-20 18:09:46 +0000 |
commit | 5c9fb52357a309b6d8e8a82a03b1fcedb65ca530 (patch) | |
tree | fe77ebc163dcce1aef1f6ec5271ace29294485f7 | |
parent | d65ec9558ca892c89c046305eea7a341b126cce1 (diff) | |
parent | 976da63ccb1cf4527c82d922d9e9a1afb48ad123 (diff) | |
download | tokio-test-5c9fb52357a309b6d8e8a82a03b1fcedb65ca530.tar.gz |
Migrate to cargo_embargo. am: 9cda7e65d3 am: 976da63ccb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-test/+/2832820
Change-Id: I6cac7ba6865678b2b4ec47be04751042161bf394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 55 | ||||
-rw-r--r-- | cargo2android.json | 5 | ||||
-rw-r--r-- | cargo_embargo.json | 3 |
3 files changed, 42 insertions, 21 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { @@ -41,13 +41,18 @@ rust_library { vendor_available: true, } -rust_defaults { - name: "tokio-test_test_defaults", - crate_name: "tokio_test", +rust_test { + name: "tokio-test_test_tests_block_on", + host_supported: true, + crate_name: "block_on", cargo_env_compat: true, cargo_pkg_version: "0.4.2", + srcs: ["tests/block_on.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", rustlibs: [ "libasync_stream", @@ -61,31 +66,49 @@ rust_defaults { } rust_test { - name: "tokio-test_test_tests_block_on", - defaults: ["tokio-test_test_defaults"], - host_supported: true, - srcs: ["tests/block_on.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { name: "tokio-test_test_tests_io", - defaults: ["tokio-test_test_defaults"], host_supported: true, + crate_name: "io", + cargo_env_compat: true, + cargo_pkg_version: "0.4.2", srcs: ["tests/io.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + rustlibs: [ + "libasync_stream", + "libbytes", + "libfutures_core", + "libfutures_util", + "libtokio", + "libtokio_stream", + "libtokio_test", + ], } rust_test { name: "tokio-test_test_tests_macros", - defaults: ["tokio-test_test_defaults"], host_supported: true, + crate_name: "macros", + cargo_env_compat: true, + cargo_pkg_version: "0.4.2", srcs: ["tests/macros.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + rustlibs: [ + "libasync_stream", + "libbytes", + "libfutures_core", + "libfutures_util", + "libtokio", + "libtokio_stream", + "libtokio_test", + ], } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index d36fb44..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "device": true, - "run": true, - "tests": true -}
\ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..9a0a579 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,3 @@ +{ + "tests": true +} |