diff options
| author | Jooyung Han <jooyung@google.com> | 2021-07-16 14:45:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-16 14:45:27 +0000 |
| commit | adb453d6586f20be2624c64500a08921aa20acf4 (patch) | |
| tree | 49f5417b92498efdc215e3eb36030da8ed881b8d | |
| parent | e256749130331314d8642b03bae178734bc93df4 (diff) | |
| parent | 05580547a280cfd3111e1887c3355f6ad093ac20 (diff) | |
| download | xml-rs-adb453d6586f20be2624c64500a08921aa20acf4.tar.gz | |
Re-enable test am: 05580547a2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/xml-rs/+/1769296
Change-Id: If8c6fb55ed390ffa70ee7c3ddf65c2377cb8297c
| -rw-r--r-- | Android.bp | 19 | ||||
| -rw-r--r-- | cargo2android.json | 6 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 20 |
3 files changed, 41 insertions, 4 deletions
@@ -100,6 +100,25 @@ rust_test { } rust_test_host { + name: "xml-rs_host_test_tests_event_writer", + defaults: ["xml-rs_test_defaults_xml_rs"], + // has rustc warnings + srcs: ["tests/event_writer.rs"], + test_options: { + unit_test: true, + }, + data: ["tests/documents/*"], +} + +rust_test { + name: "xml-rs_device_test_tests_event_writer", + defaults: ["xml-rs_test_defaults_xml_rs"], + // has rustc warnings + srcs: ["tests/event_writer.rs"], + data: ["tests/documents/*"], +} + +rust_test_host { name: "xml-rs_host_test_tests_streaming", defaults: ["xml-rs_test_defaults_xml_rs"], // has rustc warnings diff --git a/cargo2android.json b/cargo2android.json index 6ddd73e..d63dca0 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -8,8 +8,6 @@ ], "device": true, "run": true, - "test-blocklist": [ - "tests/event_writer.rs" - ], - "tests": true + "tests": true, + "patch": "patches/Android.bp.patch" }
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..465a940 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,20 @@ +diff --git a/Android.bp b/Android.bp +index 15bae6d..2800012 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -107,6 +107,7 @@ rust_test_host { + test_options: { + unit_test: true, + }, ++ data: ["tests/documents/*"], + } + + rust_test { +@@ -114,6 +115,7 @@ rust_test { + defaults: ["xml-rs_test_defaults_xml_rs"], + // has rustc warnings + srcs: ["tests/event_writer.rs"], ++ data: ["tests/documents/*"], + } + + rust_test_host { |