summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2023-03-07 10:22:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-07 10:22:55 +0000
commitfb806b6f41854d7199c7b44b09a38c5a69a7ac86 (patch)
tree1bdbade1b2a3323114fe43b270e7c696b3de6fd0
parentf6a2db4484d9458f0f5363b1e3082f5fcc5a35fa (diff)
parent61cd2a6c50b92b7f8fef0b294dc6d8b2051e88c1 (diff)
Merge "binderRpcTest: named normal modes" am: 54916ea5b3 am: 61cd2a6c50
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2471758 Change-Id: I8a0d57699728e7b343dfd167df12c07a10c6d8c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/binder/tests/binderRpcTest.cpp4
-rw-r--r--libs/binder/tests/binderRpcTestTrusty.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index 6e34d254bb..407a79194f 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -237,9 +237,13 @@ std::string BinderRpc::PrintParamInfo(const testing::TestParamInfo<ParamType>& i
std::to_string(clientVersion) + "_serverV" + std::to_string(serverVersion);
if (singleThreaded) {
ret += "_single_threaded";
+ } else {
+ ret += "_multi_threaded";
}
if (noKernel) {
ret += "_no_kernel";
+ } else {
+ ret += "_with_kernel";
}
return ret;
}
diff --git a/libs/binder/tests/binderRpcTestTrusty.cpp b/libs/binder/tests/binderRpcTestTrusty.cpp
index 84abbac6c6..63b56a3a64 100644
--- a/libs/binder/tests/binderRpcTestTrusty.cpp
+++ b/libs/binder/tests/binderRpcTestTrusty.cpp
@@ -45,9 +45,13 @@ std::string BinderRpc::PrintParamInfo(const testing::TestParamInfo<ParamType>& i
std::to_string(serverVersion);
if (singleThreaded) {
ret += "_single_threaded";
+ } else {
+ ret += "_multi_threaded";
}
if (noKernel) {
ret += "_no_kernel";
+ } else {
+ ret += "_with_kernel";
}
return ret;
}