eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1838 from google/9A681768AABE08D1EFA5CA77528236A4

Browse Source 
Googletest export
This commit is contained in:
Gennadiy Civil 2018-09-14 15:54:01 -04:00 committed by GitHub
commit d4ca2d62b4
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -29,10 +29,6 @@ matrix:
group: deprecated-2017Q4 group: deprecated-2017Q4
compiler: gcc compiler: gcc
env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11
- os: linux
group: deprecated-2017Q4
compiler: clang
env: BUILD_TYPE=Debug VERBOSE=1
- os: linux - os: linux
group: deprecated-2017Q4 group: deprecated-2017Q4
compiler: clang compiler: clang
@ -40,16 +36,9 @@ matrix:
- os: linux - os: linux
compiler: clang compiler: clang
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON
- os: osx
compiler: gcc
env: BUILD_TYPE=Debug VERBOSE=1
- os: osx - os: osx
compiler: gcc compiler: gcc
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
- os: osx
compiler: clang
env: BUILD_TYPE=Debug VERBOSE=1
if: type != pull_request
- os: osx - os: osx
env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11
if: type != pull_request if: type != pull_request

11
googletest/test/gtest_unittest.cc
View File

@ -63,9 +63,7 @@ TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) {
#include <map> #include <map>
#include <vector> #include <vector>
#include <ostream> #include <ostream>
#if GTEST_LANG_CXX11
#include <unordered_set> #include <unordered_set>
#endif // GTEST_LANG_CXX11
#include "gtest/gtest-spi.h" #include "gtest/gtest-spi.h"
#include "src/gtest-internal-inl.h" #include "src/gtest-internal-inl.h"
@ -5156,8 +5154,7 @@ TEST(AssertionResultTest, CanStreamOstreamManipulators) {
EXPECT_STREQ("Data\n\\0Will be visible", r.message()); EXPECT_STREQ("Data\n\\0Will be visible", r.message());
} }
// The next test uses explicit conversion operators -- a C++11 feature. // The next test uses explicit conversion operators
#if GTEST_LANG_CXX11
TEST(AssertionResultTest, ConstructibleFromContextuallyConvertibleToBool) { TEST(AssertionResultTest, ConstructibleFromContextuallyConvertibleToBool) {
struct ExplicitlyConvertibleToBool { struct ExplicitlyConvertibleToBool {
@ -5170,8 +5167,6 @@ TEST(AssertionResultTest, ConstructibleFromContextuallyConvertibleToBool) {
EXPECT_TRUE(v2); EXPECT_TRUE(v2);
} }
#endif // GTEST_LANG_CXX11
struct ConvertibleToAssertionResult { struct ConvertibleToAssertionResult {
operator AssertionResult() const { return AssertionResult(true); } operator AssertionResult() const { return AssertionResult(true); }
}; };
@ -7555,7 +7550,6 @@ TEST(IsContainerTestTest, WorksForContainer) {
sizeof(IsContainerTest<std::map<int, double> >(0))); sizeof(IsContainerTest<std::map<int, double> >(0)));
} }
#if GTEST_LANG_CXX11
struct ConstOnlyContainerWithPointerIterator { struct ConstOnlyContainerWithPointerIterator {
using const_iterator = int*; using const_iterator = int*;
const_iterator begin() const; const_iterator begin() const;
@ -7577,7 +7571,6 @@ TEST(IsContainerTestTest, ConstOnlyContainer) {
EXPECT_EQ(sizeof(IsContainer), EXPECT_EQ(sizeof(IsContainer),
sizeof(IsContainerTest<ConstOnlyContainerWithClassIterator>(0))); sizeof(IsContainerTest<ConstOnlyContainerWithClassIterator>(0)));
} }
#endif // GTEST_LANG_CXX11
// Tests IsHashTable. // Tests IsHashTable.
struct AHashTable { struct AHashTable {
@ -7590,10 +7583,8 @@ struct NotReallyAHashTable {
TEST(IsHashTable, Basic) { TEST(IsHashTable, Basic) {
EXPECT_TRUE(testing::internal::IsHashTable<AHashTable>::value); EXPECT_TRUE(testing::internal::IsHashTable<AHashTable>::value);
EXPECT_FALSE(testing::internal::IsHashTable<NotReallyAHashTable>::value); EXPECT_FALSE(testing::internal::IsHashTable<NotReallyAHashTable>::value);
#if GTEST_LANG_CXX11
EXPECT_FALSE(testing::internal::IsHashTable<std::vector<int>>::value); EXPECT_FALSE(testing::internal::IsHashTable<std::vector<int>>::value);
EXPECT_TRUE(testing::internal::IsHashTable<std::unordered_set<int>>::value); EXPECT_TRUE(testing::internal::IsHashTable<std::unordered_set<int>>::value);
#endif // GTEST_LANG_CXX11
#if GTEST_HAS_HASH_SET_ #if GTEST_HAS_HASH_SET_
EXPECT_TRUE(testing::internal::IsHashTable<__gnu_cxx::hash_set<int>>::value); EXPECT_TRUE(testing::internal::IsHashTable<__gnu_cxx::hash_set<int>>::value);
#endif // GTEST_HAS_HASH_SET_ #endif // GTEST_HAS_HASH_SET_