[
https://issues.apache.org/jira/browse/HDFS-15232?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17064625#comment-17064625
]
Akira Ajisaka commented on HDFS-15232:
--------------------------------------
After the change suggested in
[https://github.com/google/googletest/issues/705#issuecomment-235067917], the
tests passed.
Here is the diff:
{code}
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/third_party/gmock-1.7.0/gmoc
index e8dd7fc..dd1b865 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/third_party/gmock-1.7.0/gmock/gmock
+++
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/third_party/gmock-1.7.0/gmock/gmock
@@ -9930,6 +9930,8 @@ class ActionResultHolder : public
UntypedActionResultHolderBase {
template <>
class ActionResultHolder<void> : public UntypedActionResultHolderBase {
public:
+ explicit ActionResultHolder() {}
+
void GetValueAndDelete() const { delete this; }
virtual void PrintAsActionResult(::std::ostream* /* os */) const {}
@@ -9941,7 +9943,7 @@ class ActionResultHolder<void> : public
UntypedActionResultHolderBase {
const typename Function<F>::ArgumentTuple& args,
const string& call_description) {
func_mocker->PerformDefaultAction(args, call_description);
- return NULL;
+ return new ActionResultHolder();
}
// Performs the given action and returns NULL.
@@ -9950,7 +9952,7 @@ class ActionResultHolder<void> : public
UntypedActionResultHolderBase {
const Action<F>& action,
const typename Function<F>::ArgumentTuple& args) {
action.Perform(args);
- return NULL;
+ return new ActionResultHolder();
}
};
{code}
This code has been fixed since gmock 1.8.x, so I'll upgrade gmock (moved to
googletest) to 1.8.1.
> Some CTESTs are failing after HADOOP-16054
> ------------------------------------------
>
> Key: HDFS-15232
> URL: https://issues.apache.org/jira/browse/HDFS-15232
> Project: Hadoop HDFS
> Issue Type: Bug
> Components: native
> Reporter: Akira Ajisaka
> Assignee: Akira Ajisaka
> Priority: Major
>
> Failed CTEST tests after HADOOP-16054:
> * remote_block_reader
> * memcheck_remote_block_reader
> * bad_datanode
> * memcheck_bad_datanode
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
