summaryrefslogtreecommitdiff
path: root/odrefresh/odrefresh_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'odrefresh/odrefresh_test.cc')
-rw-r--r--odrefresh/odrefresh_test.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/odrefresh/odrefresh_test.cc b/odrefresh/odrefresh_test.cc
index d28c0d8942..cb6bee0a88 100644
--- a/odrefresh/odrefresh_test.cc
+++ b/odrefresh/odrefresh_test.cc
@@ -71,11 +71,10 @@ class MockExecUtils : public ExecUtils {
public:
// A workaround to avoid MOCK_METHOD on a method with an `std::string*` parameter, which will lead
// to a conflict between gmock and android-base/logging.h (b/132668253).
- int ExecAndReturnCode(const std::vector<std::string>& arg_vector,
- int,
- bool*,
- std::string*) const override {
- return DoExecAndReturnCode(arg_vector);
+ ExecResult ExecAndReturnResult(const std::vector<std::string>& arg_vector,
+ int,
+ std::string*) const override {
+ return {.status = ExecResult::kExited, .exit_code = DoExecAndReturnCode(arg_vector)};
}
MOCK_METHOD(int, DoExecAndReturnCode, (const std::vector<std::string>& arg_vector), (const));