gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into deprecate

Browse Source
This commit is contained in:
Gennadiy Civil
2018-07-26 13:04:53 -04:00
committed by GitHub
parent fd4f7cc729 40904f8970
commit 6cacb41935
7 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
googletest/test/gtest_prod_test.cc
View File

@@ -29,7 +29,7 @@
//
// Author: wan@google.com (Zhanyong Wan)
//
// Unit test for gtest/gtest_prod.h.
// Unit test for gtest_prod.h.
#include "production.h"
#include "gtest/gtest.h"

4
googletest/test/gtest_unittest.cc
View File

@@ -35,8 +35,8 @@
#include "gtest/gtest.h"
// Verifies that the command line flag variables can be accessed in
// code once "gtest/gtest.h" has been
// #included. Do not move it after other gtest #includes.
// code once "gtest.h" has been #included.
// Do not move it after other gtest #includes.
TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) {
bool dummy = testing::GTEST_FLAG(also_run_disabled_tests)
|| testing::GTEST_FLAG(break_on_failure)