Merge "libbinder_rs: Modify asserts to propagate failure to C++" am: f867ed2f2a am: 4fb0f92512 (91d42e48) · Commits · e / os / android_frameworks_native

libs/binder/rust/tests/serialization.rs

+36 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,41 @@ mod bindings {
	include!(concat!(env!("OUT_DIR"), "/bindings.rs"));		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 SERVICE_ONCE: Once = Once::new();
	static mut SERVICE: Option<SpIBinder> = None;		static mut SERVICE: Option<SpIBinder> = None;

	@@ -282,7 +317,7 @@ fn on_transact(_service: &dyn ReadParcelTest, code: TransactionCode,
	))?;		))?;
	}		}
	bindings::Transaction_TEST_FAIL => {		bindings::Transaction_TEST_FAIL => {
	return Err(StatusCode::FAILED_TRANSACTION)		assert!(false);
	}		}
	_ => return Err(StatusCode::UNKNOWN_TRANSACTION),		_ => return Err(StatusCode::UNKNOWN_TRANSACTION),
	}		}