Merge branch 'master' into hethi/unused-import

88b76525 · Herbert Thielen · GitHub · 1a8ba674 · 7c6353d2 · 88b76525
Commit 88b76525 authored Sep 05, 2017 by Herbert Thielen Committed by GitHub Sep 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

googletest/test/gtest_unittest.cc googletest/test/gtest_unittest.cc +1 -1

travis.sh travis.sh +1 -0

No files found.
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -7655,7 +7655,7 @@ TEST(NativeArrayTest, MethodsWork) {
  EXPECT_EQ(0, *it);
  ++it;
  EXPECT_EQ(1, *it);
-  it++;
+  ++it;
  EXPECT_EQ(2, *it);
  ++it;
  EXPECT_EQ(na.end(), it);

--- a/travis.sh
+++ b/travis.sh
@@ -8,6 +8,7 @@ cmake -Dgtest_build_samples=ON \
      -Dgtest_build_tests=ON \
      -Dgmock_build_tests=ON \
      -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
+      -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
      ..
 make
 CTEST_OUTPUT_ON_FAILURE=1 make test