diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2021-10-18 14:25:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-18 14:25:34 +0000 |
commit | e57048e854ee8fc6b3c497cbc010222ae21cd1b5 (patch) | |
tree | ac21e39347d2b3c52941379aef433445df21565a | |
parent | 40de18409c3678f9f5dc74fe85c15381f7cabed4 (diff) | |
parent | 29ead78536f3173e7bbc8b9d60c633b29623b70d (diff) | |
download | bytes-e57048e854ee8fc6b3c497cbc010222ae21cd1b5.tar.gz |
Enable tests in Android CI am: 1b3445f64d am: fcb1b69a41 am: e2e4ec4a4e am: 29ead78536
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bytes/+/1859255
Change-Id: I0a466e7c2782288c7ea0fd5c90817f67ec0f9f86
-rw-r--r-- | Android.bp | 214 | ||||
-rw-r--r-- | TEST_MAPPING | 36 | ||||
-rw-r--r-- | cargo2android.json | 5 | ||||
-rw-r--r-- | patches/test_bytes.rs.patch | 12 | ||||
-rw-r--r-- | tests/test_bytes.rs | 1 |
5 files changed, 266 insertions, 2 deletions
@@ -18,6 +18,220 @@ license { ], } +rust_defaults { + name: "bytes_test_defaults", + crate_name: "bytes", + srcs: ["src/lib.rs"], + cargo_env_compat: true, + cargo_pkg_version: "1.1.0", + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2018", + features: [ + "default", + "std", + ], + rustlibs: [ + "libserde_test", + ], +} + +rust_test_host { + name: "bytes_host_test_src_lib", + defaults: ["bytes_test_defaults"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_src_lib", + defaults: ["bytes_test_defaults"], +} + +rust_defaults { + name: "bytes_test_defaults_bytes", + crate_name: "bytes", + cargo_env_compat: true, + cargo_pkg_version: "1.1.0", + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2018", + features: [ + "default", + "std", + ], + rustlibs: [ + "libbytes", + "libserde_test", + ], +} + +rust_test_host { + name: "bytes_host_test_tests_test_buf", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_buf.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_tests_test_buf", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_buf.rs"], +} + +rust_test_host { + name: "bytes_host_test_tests_test_buf_mut", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_buf_mut.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_tests_test_buf_mut", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_buf_mut.rs"], +} + +rust_test_host { + name: "bytes_host_test_tests_test_bytes", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_bytes.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_tests_test_bytes", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_bytes.rs"], +} + +rust_test_host { + name: "bytes_host_test_tests_test_bytes_odd_alloc", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_bytes_odd_alloc.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_tests_test_bytes_odd_alloc", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_bytes_odd_alloc.rs"], +} + +rust_test_host { + name: "bytes_host_test_tests_test_bytes_vec_alloc", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_bytes_vec_alloc.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_tests_test_bytes_vec_alloc", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_bytes_vec_alloc.rs"], +} + +rust_test_host { + name: "bytes_host_test_tests_test_chain", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_chain.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_tests_test_chain", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_chain.rs"], +} + +rust_test_host { + name: "bytes_host_test_tests_test_debug", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_debug.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_tests_test_debug", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_debug.rs"], +} + +rust_test_host { + name: "bytes_host_test_tests_test_iter", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_iter.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_tests_test_iter", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_iter.rs"], +} + +rust_test_host { + name: "bytes_host_test_tests_test_reader", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_reader.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_tests_test_reader", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_reader.rs"], +} + +rust_test_host { + name: "bytes_host_test_tests_test_serde", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_serde.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_tests_test_serde", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_serde.rs"], +} + +rust_test_host { + name: "bytes_host_test_tests_test_take", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_take.rs"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "bytes_device_test_tests_test_take", + defaults: ["bytes_test_defaults_bytes"], + srcs: ["tests/test_take.rs"], +} + rust_library { name: "libbytes", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index b4673b5..bb4019d 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,6 +2,42 @@ { "presubmit": [ { + "name": "bytes_device_test_src_lib" + }, + { + "name": "bytes_device_test_tests_test_buf" + }, + { + "name": "bytes_device_test_tests_test_buf_mut" + }, + { + "name": "bytes_device_test_tests_test_bytes" + }, + { + "name": "bytes_device_test_tests_test_bytes_odd_alloc" + }, + { + "name": "bytes_device_test_tests_test_bytes_vec_alloc" + }, + { + "name": "bytes_device_test_tests_test_chain" + }, + { + "name": "bytes_device_test_tests_test_debug" + }, + { + "name": "bytes_device_test_tests_test_iter" + }, + { + "name": "bytes_device_test_tests_test_reader" + }, + { + "name": "bytes_device_test_tests_test_serde" + }, + { + "name": "bytes_device_test_tests_test_take" + }, + { "name": "doh_unit_test" }, { diff --git a/cargo2android.json b/cargo2android.json index 01465d0..f72af5e 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -7,5 +7,6 @@ "min_sdk_version": "29", "dependencies": true, "device": true, - "run": true -}
\ No newline at end of file + "run": true, + "tests": true +} diff --git a/patches/test_bytes.rs.patch b/patches/test_bytes.rs.patch new file mode 100644 index 0000000..429e7f5 --- /dev/null +++ b/patches/test_bytes.rs.patch @@ -0,0 +1,12 @@ +diff --git a/tests/test_bytes.rs b/tests/test_bytes.rs +index f0cae99..402017b 100644 +--- a/tests/test_bytes.rs ++++ b/tests/test_bytes.rs +@@ -288,6 +288,7 @@ fn split_to_uninitialized() { + } + + #[test] ++#[ignore = "Android: we unwind differently."] + fn split_off_to_at_gt_len() { + fn make_bytes() -> Bytes { + let mut bytes = BytesMut::with_capacity(100); diff --git a/tests/test_bytes.rs b/tests/test_bytes.rs index f0cae99..402017b 100644 --- a/tests/test_bytes.rs +++ b/tests/test_bytes.rs @@ -288,6 +288,7 @@ fn split_to_uninitialized() { } #[test] +#[ignore = "Android: we unwind differently."] fn split_off_to_at_gt_len() { fn make_bytes() -> Bytes { let mut bytes = BytesMut::with_capacity(100); |