diff options
author | Steven Moreland <smoreland@google.com> | 2021-02-25 01:53:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-25 01:53:27 +0000 |
commit | 4fb0f925123397465bfb9b50f7030229e537e1cd (patch) | |
tree | 4d1f9e06142948801401538ca645058c20f53828 | |
parent | 7358ada5cf42d598eaf99f334287cb194558bafb (diff) | |
parent | f867ed2f2a47e8521566735cefa3fa85bdfdb090 (diff) | |
download | native-4fb0f925123397465bfb9b50f7030229e537e1cd.tar.gz |
Merge "libbinder_rs: Modify asserts to propagate failure to C++" am: f867ed2f2a
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1588098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idc8a1ee8f1ec7c2ec62033b998900947a94bdc27
-rw-r--r-- | libs/binder/rust/tests/serialization.rs | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/libs/binder/rust/tests/serialization.rs b/libs/binder/rust/tests/serialization.rs index 2bf3d03a4b..f1b068ee43 100644 --- a/libs/binder/rust/tests/serialization.rs +++ b/libs/binder/rust/tests/serialization.rs @@ -40,6 +40,41 @@ mod bindings { include!(concat!(env!("OUT_DIR"), "/bindings.rs")); } +macro_rules! assert_eq { + ($left:expr, $right:expr $(,)?) => { + match (&$left, &$right) { + (left, right) => { + if *left != *right { + eprintln!( + "assertion failed: `{:?}` == `{:?}`, {}:{}:{}", + &*left, + &*right, + file!(), + line!(), + column!() + ); + return Err(StatusCode::FAILED_TRANSACTION); + } + } + } + }; +} + +macro_rules! assert { + ($expr:expr) => { + if !$expr { + eprintln!( + "assertion failed: `{:?}`, {}:{}:{}", + $expr, + file!(), + line!(), + column!() + ); + return Err(StatusCode::FAILED_TRANSACTION); + } + }; +} + static SERVICE_ONCE: Once = Once::new(); static mut SERVICE: Option<SpIBinder> = None; @@ -282,7 +317,7 @@ fn on_transact(_service: &dyn ReadParcelTest, code: TransactionCode, ))?; } bindings::Transaction_TEST_FAIL => { - return Err(StatusCode::FAILED_TRANSACTION) + assert!(false); } _ => return Err(StatusCode::UNKNOWN_TRANSACTION), } |