diff options
| author | Jooyung Han <jooyung@google.com> | 2021-07-16 22:36:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-16 22:36:25 +0000 |
| commit | 32463a09b7d1f6174cdd8a735ba91ef6a19c543b (patch) | |
| tree | 97f311cf0b1e85ac8ba296f21115d1a7088148db | |
| parent | 0af61e5f0301a938a97752d0e710599a9e567a3b (diff) | |
| parent | 7d38e5d665f8801213bad43d539bf2a9e843f3ae (diff) | |
| download | xml-rs-32463a09b7d1f6174cdd8a735ba91ef6a19c543b.tar.gz | |
Revert "Re-enable test" am: d08be5c9c7 am: 20c72133fa am: 7d38e5d665
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/xml-rs/+/1770605
Change-Id: I8124dc3e8da85e21ac5c27ce3c81770312a59941
| -rw-r--r-- | Android.bp | 19 | ||||
| -rw-r--r-- | cargo2android.json | 6 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 20 |
3 files changed, 4 insertions, 41 deletions
@@ -100,25 +100,6 @@ 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 d63dca0..6ddd73e 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -8,6 +8,8 @@ ], "device": true, "run": true, - "tests": true, - "patch": "patches/Android.bp.patch" + "test-blocklist": [ + "tests/event_writer.rs" + ], + "tests": true }
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index 465a940..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 { |