Skip to content

GitLab

Commit 88b76525 authored by Herbert Thielen's avatar Herbert Thielen Committed by GitHub
Browse files

Merge branch 'master' into hethi/unused-import

parents 1a8ba674 7c6353d2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
googletest/test/gtest_unittest.cc
View file @ 88b76525
...@@ -7655,7 +7655,7 @@ TEST(NativeArrayTest, MethodsWork) { ...@@ -7655,7 +7655,7 @@ TEST(NativeArrayTest, MethodsWork) {
EXPECT_EQ(0, *it); EXPECT_EQ(0, *it);
++it; ++it;
EXPECT_EQ(1, *it); EXPECT_EQ(1, *it);
it++; ++it;
EXPECT_EQ(2, *it); EXPECT_EQ(2, *it);
++it; ++it;
EXPECT_EQ(na.end(), it); EXPECT_EQ(na.end(), it);
......
travis.sh
View file @ 88b76525
...@@ -8,6 +8,7 @@ cmake -Dgtest_build_samples=ON \ ...@@ -8,6 +8,7 @@ cmake -Dgtest_build_samples=ON \
-Dgtest_build_tests=ON \ -Dgtest_build_tests=ON \
-Dgmock_build_tests=ON \ -Dgmock_build_tests=ON \
-DCMAKE_CXX_FLAGS=$CXX_FLAGS \ -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
.. ..
make make
CTEST_OUTPUT_ON_FAILURE=1 make test CTEST_OUTPUT_ON_FAILURE=1 make test
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment