summaryrefslogtreecommitdiffstats
path: root/googletest/src
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2018-10-29 19:18:53 (GMT)
committerGennadiy Civil <misterg@google.com>2018-10-31 01:20:35 (GMT)
commite0d3c37051865bf2ec32de3be0a408a8f2a106ac (patch)
tree92dce5b496b873ab49aea9783445a7e5a00dc4fe /googletest/src
parentcc9dcc54129bafebaeb8e9ffa619bffb71a08474 (diff)
downloadgoogletest-e0d3c37051865bf2ec32de3be0a408a8f2a106ac.zip
googletest-e0d3c37051865bf2ec32de3be0a408a8f2a106ac.tar.gz
googletest-e0d3c37051865bf2ec32de3be0a408a8f2a106ac.tar.bz2
Googletest export
Fix broken Fuchsia cc_test. PiperOrigin-RevId: 219170936
Diffstat (limited to 'googletest/src')
-rw-r--r--googletest/src/gtest-death-test.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index 27f272d..c4f6270 100644
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -821,8 +821,9 @@ class FuchsiaDeathTest : public DeathTestImpl {
: DeathTestImpl(a_statement, a_regex), file_(file), line_(line) {}
// All of these virtual functions are inherited from DeathTest.
- virtual int Wait();
- virtual TestRole AssumeRole();
+ int Wait() override;
+ TestRole AssumeRole() override;
+ std::string GetErrorLogs() override;
private:
// The name of the file in which the death test is located.