diff options
author | Haibo Huang <hhb@google.com> | 2019-05-20 12:27:41 -0700 |
---|---|---|
committer | Haibo Huang <hhb@google.com> | 2019-05-20 19:30:25 +0000 |
commit | 87270fdd7e2fbad37284ebf00719e87932f1410c (patch) | |
tree | 3ffef5ccab03ff48f009ba7bd648846665ab8f74 | |
parent | 30a41c2a30d28ec1d1e5ab1df5fb3060c9ee0cdc (diff) | |
download | wifilogd-87270fdd7e2fbad37284ebf00719e87932f1410c.tar.gz |
Using ::testing::DoAllandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13
Without this statement, compilation failed with new googletest.
Exempt-From-Owner-Approval: Fix unit test.
Test: build
Bug: 129498355
Change-Id: I522ef9614439ba1630e29788f7512180feea01de
-rw-r--r-- | tests/os_unittest.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/os_unittest.cpp b/tests/os_unittest.cpp index 0cfb493..a014973 100644 --- a/tests/os_unittest.cpp +++ b/tests/os_unittest.cpp @@ -38,8 +38,9 @@ namespace wifilogd { namespace { using ::testing::_; -using ::testing::Invoke; +using ::testing::DoAll; using ::testing::InSequence; +using ::testing::Invoke; using ::testing::Matcher; using ::testing::MatcherInterface; using ::testing::MatchResultListener; @@ -48,8 +49,8 @@ using ::testing::Pointee; using ::testing::Return; using ::testing::SetArgumentPointee; using ::testing::SetErrnoAndReturn; -using ::testing::StrictMock; using ::testing::StrEq; +using ::testing::StrictMock; using local_utils::GetMaxVal; |