Formatting changes, code sync
This commit is contained in:
parent
78b49242d1
commit
ed1edf641d
|
@ -33,13 +33,12 @@
|
|||
// threads concurrently.
|
||||
|
||||
#include "gmock/gmock.h"
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
namespace testing {
|
||||
namespace {
|
||||
|
||||
// From "gtest/internal/gtest-port.h".
|
||||
// From gtest-port.h.
|
||||
using ::testing::internal::ThreadWithParam;
|
||||
|
||||
// The maximum number of test threads (not including helper threads)
|
||||
|
|
|
@ -34,8 +34,7 @@
|
|||
// Google Test. They are subject to change without notice. They should not used
|
||||
// by code external to Google Test.
|
||||
//
|
||||
// This header file is #included by
|
||||
// gtest/internal/gtest-internal.h.
|
||||
// This header file is #included by gtest-internal.h.
|
||||
// It should not be #included by other files.
|
||||
|
||||
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue
Block a user