Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
dac3e879
Commit
dac3e879
authored
Sep 14, 2010
by
zhanyong.wan
Browse files
Include gtest headers as user headers instead of system headers.
parent
88e0df62
Changes
87
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
48 additions
and
48 deletions
+48
-48
README
README
+1
-1
include/gtest/gtest-death-test.h
include/gtest/gtest-death-test.h
+1
-1
include/gtest/gtest-message.h
include/gtest/gtest-message.h
+2
-2
include/gtest/gtest-param-test.h
include/gtest/gtest-param-test.h
+4
-4
include/gtest/gtest-param-test.h.pump
include/gtest/gtest-param-test.h.pump
+4
-4
include/gtest/gtest-printers.h
include/gtest/gtest-printers.h
+2
-2
include/gtest/gtest-spi.h
include/gtest/gtest-spi.h
+1
-1
include/gtest/gtest-test-part.h
include/gtest/gtest-test-part.h
+2
-2
include/gtest/gtest-typed-test.h
include/gtest/gtest-typed-test.h
+2
-2
include/gtest/gtest.h
include/gtest/gtest.h
+10
-10
include/gtest/internal/gtest-death-test-internal.h
include/gtest/internal/gtest-death-test-internal.h
+1
-1
include/gtest/internal/gtest-filepath.h
include/gtest/internal/gtest-filepath.h
+1
-1
include/gtest/internal/gtest-internal.h
include/gtest/internal/gtest-internal.h
+4
-4
include/gtest/internal/gtest-linked_ptr.h
include/gtest/internal/gtest-linked_ptr.h
+1
-1
include/gtest/internal/gtest-param-util-generated.h
include/gtest/internal/gtest-param-util-generated.h
+2
-2
include/gtest/internal/gtest-param-util-generated.h.pump
include/gtest/internal/gtest-param-util-generated.h.pump
+2
-2
include/gtest/internal/gtest-param-util.h
include/gtest/internal/gtest-param-util.h
+4
-4
include/gtest/internal/gtest-port.h
include/gtest/internal/gtest-port.h
+1
-1
include/gtest/internal/gtest-string.h
include/gtest/internal/gtest-string.h
+1
-1
include/gtest/internal/gtest-type-util.h
include/gtest/internal/gtest-type-util.h
+2
-2
No files found.
README
View file @
dac3e879
...
@@ -262,7 +262,7 @@ and all features using tuple will be disabled.
...
@@ -262,7 +262,7 @@ and all features using tuple will be disabled.
###
Multi
-
threaded
Tests
###
###
Multi
-
threaded
Tests
###
Google
Test
is
thread
-
safe
where
the
pthread
library
is
available
.
Google
Test
is
thread
-
safe
where
the
pthread
library
is
available
.
After
#
include
<
gtest
/
gtest
.
h
>
,
you
can
check
the
GTEST_IS_THREADSAFE
After
#
include
"
gtest/gtest.h
"
,
you
can
check
the
GTEST_IS_THREADSAFE
macro
to
see
whether
this
is
the
case
(
yes
if
the
macro
is
#
defined
to
macro
to
see
whether
this
is
the
case
(
yes
if
the
macro
is
#
defined
to
1
,
no
if
it
's undefined.).
1
,
no
if
it
's undefined.).
...
...
include/gtest/gtest-death-test.h
View file @
dac3e879
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
#ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
#ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
#define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
#define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
#include
<
gtest/internal/gtest-death-test-internal.h
>
#include
"
gtest/internal/gtest-death-test-internal.h
"
namespace
testing
{
namespace
testing
{
...
...
include/gtest/gtest-message.h
View file @
dac3e879
...
@@ -48,8 +48,8 @@
...
@@ -48,8 +48,8 @@
#include <limits>
#include <limits>
#include
<
gtest/internal/gtest-string.h
>
#include
"
gtest/internal/gtest-string.h
"
#include
<
gtest/internal/gtest-internal.h
>
#include
"
gtest/internal/gtest-internal.h
"
namespace
testing
{
namespace
testing
{
...
...
include/gtest/gtest-param-test.h
View file @
dac3e879
...
@@ -149,7 +149,7 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
...
@@ -149,7 +149,7 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
#endif // 0
#endif // 0
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
#if !GTEST_OS_SYMBIAN
#if !GTEST_OS_SYMBIAN
#include <utility>
#include <utility>
...
@@ -158,9 +158,9 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
...
@@ -158,9 +158,9 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
// scripts/fuse_gtest.py depends on gtest's own header being #included
// scripts/fuse_gtest.py depends on gtest's own header being #included
// *unconditionally*. Therefore these #includes cannot be moved
// *unconditionally*. Therefore these #includes cannot be moved
// inside #if GTEST_HAS_PARAM_TEST.
// inside #if GTEST_HAS_PARAM_TEST.
#include
<
gtest/internal/gtest-internal.h
>
#include
"
gtest/internal/gtest-internal.h
"
#include
<
gtest/internal/gtest-param-util.h
>
#include
"
gtest/internal/gtest-param-util.h
"
#include
<
gtest/internal/gtest-param-util-generated.h
>
#include
"
gtest/internal/gtest-param-util-generated.h
"
#if GTEST_HAS_PARAM_TEST
#if GTEST_HAS_PARAM_TEST
...
...
include/gtest/gtest-param-test.h.pump
View file @
dac3e879
...
@@ -147,7 +147,7 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
...
@@ -147,7 +147,7 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
#endif // 0
#endif // 0
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
#if !GTEST_OS_SYMBIAN
#if !GTEST_OS_SYMBIAN
#include <utility>
#include <utility>
...
@@ -156,9 +156,9 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
...
@@ -156,9 +156,9 @@ INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
// scripts/fuse_gtest.py depends on gtest's own header being #included
// scripts/fuse_gtest.py depends on gtest's own header being #included
// *unconditionally*. Therefore these #includes cannot be moved
// *unconditionally*. Therefore these #includes cannot be moved
// inside #if GTEST_HAS_PARAM_TEST.
// inside #if GTEST_HAS_PARAM_TEST.
#include
<
gtest/internal/gtest-internal.h
>
#include
"
gtest/internal/gtest-internal.h
"
#include
<
gtest/internal/gtest-param-util.h
>
#include
"
gtest/internal/gtest-param-util.h
"
#include
<
gtest/internal/gtest-param-util-generated.h
>
#include
"
gtest/internal/gtest-param-util-generated.h
"
#if GTEST_HAS_PARAM_TEST
#if GTEST_HAS_PARAM_TEST
...
...
include/gtest/gtest-printers.h
View file @
dac3e879
...
@@ -100,8 +100,8 @@
...
@@ -100,8 +100,8 @@
#include <string>
#include <string>
#include <utility>
#include <utility>
#include <vector>
#include <vector>
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
#include
<
gtest/internal/gtest-internal.h
>
#include
"
gtest/internal/gtest-internal.h
"
namespace
testing
{
namespace
testing
{
...
...
include/gtest/gtest-spi.h
View file @
dac3e879
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_
#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_
#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_
#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
namespace
testing
{
namespace
testing
{
...
...
include/gtest/gtest-test-part.h
View file @
dac3e879
...
@@ -35,8 +35,8 @@
...
@@ -35,8 +35,8 @@
#include <iosfwd>
#include <iosfwd>
#include <vector>
#include <vector>
#include
<
gtest/internal/gtest-internal.h
>
#include
"
gtest/internal/gtest-internal.h
"
#include
<
gtest/internal/gtest-string.h
>
#include
"
gtest/internal/gtest-string.h
"
namespace
testing
{
namespace
testing
{
...
...
include/gtest/gtest-typed-test.h
View file @
dac3e879
...
@@ -146,8 +146,8 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
...
@@ -146,8 +146,8 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
#endif // 0
#endif // 0
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
#include
<
gtest/internal/gtest-type-util.h
>
#include
"
gtest/internal/gtest-type-util.h
"
// Implements typed tests.
// Implements typed tests.
...
...
include/gtest/gtest.h
View file @
dac3e879
...
@@ -54,15 +54,15 @@
...
@@ -54,15 +54,15 @@
#include <limits>
#include <limits>
#include <vector>
#include <vector>
#include
<
gtest/internal/gtest-internal.h
>
#include
"
gtest/internal/gtest-internal.h
"
#include
<
gtest/internal/gtest-string.h
>
#include
"
gtest/internal/gtest-string.h
"
#include
<
gtest/gtest-death-test.h
>
#include
"
gtest/gtest-death-test.h
"
#include
<
gtest/gtest-message.h
>
#include
"
gtest/gtest-message.h
"
#include
<
gtest/gtest-param-test.h
>
#include
"
gtest/gtest-param-test.h
"
#include
<
gtest/gtest-printers.h
>
#include
"
gtest/gtest-printers.h
"
#include
<
gtest/gtest_prod.h
>
#include
"
gtest/gtest_prod.h
"
#include
<
gtest/gtest-test-part.h
>
#include
"
gtest/gtest-test-part.h
"
#include
<
gtest/gtest-typed-test.h
>
#include
"
gtest/gtest-typed-test.h
"
// Depending on the platform, different string classes are available.
// Depending on the platform, different string classes are available.
// On Linux, in addition to ::std::string, Google also makes use of
// On Linux, in addition to ::std::string, Google also makes use of
...
@@ -1736,7 +1736,7 @@ const T* TestWithParam<T>::parameter_ = NULL;
...
@@ -1736,7 +1736,7 @@ const T* TestWithParam<T>::parameter_ = NULL;
// Includes the auto-generated header that implements a family of
// Includes the auto-generated header that implements a family of
// generic predicate assertion macros.
// generic predicate assertion macros.
#include
<
gtest/gtest_pred_impl.h
>
#include
"
gtest/gtest_pred_impl.h
"
// Macros for testing equalities and inequalities.
// Macros for testing equalities and inequalities.
//
//
...
...
include/gtest/internal/gtest-death-test-internal.h
View file @
dac3e879
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
#include
<
gtest/internal/gtest-internal.h
>
#include
"
gtest/internal/gtest-internal.h
"
namespace
testing
{
namespace
testing
{
namespace
internal
{
namespace
internal
{
...
...
include/gtest/internal/gtest-filepath.h
View file @
dac3e879
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
#include
<
gtest/internal/gtest-string.h
>
#include
"
gtest/internal/gtest-string.h
"
namespace
testing
{
namespace
testing
{
namespace
internal
{
namespace
internal
{
...
...
include/gtest/internal/gtest-internal.h
View file @
dac3e879
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
#if GTEST_OS_LINUX
#if GTEST_OS_LINUX
#include <stdlib.h>
#include <stdlib.h>
...
@@ -52,9 +52,9 @@
...
@@ -52,9 +52,9 @@
#include <limits>
#include <limits>
#include <set>
#include <set>
#include
<
gtest/internal/gtest-string.h
>
#include
"
gtest/internal/gtest-string.h
"
#include
<
gtest/internal/gtest-filepath.h
>
#include
"
gtest/internal/gtest-filepath.h
"
#include
<
gtest/internal/gtest-type-util.h
>
#include
"
gtest/internal/gtest-type-util.h
"
// Due to C++ preprocessor weirdness, we need double indirection to
// Due to C++ preprocessor weirdness, we need double indirection to
// concatenate two tokens when one of them is __LINE__. Writing
// concatenate two tokens when one of them is __LINE__. Writing
...
...
include/gtest/internal/gtest-linked_ptr.h
View file @
dac3e879
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
#include <stdlib.h>
#include <stdlib.h>
#include <assert.h>
#include <assert.h>
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
namespace
testing
{
namespace
testing
{
namespace
internal
{
namespace
internal
{
...
...
include/gtest/internal/gtest-param-util-generated.h
View file @
dac3e879
...
@@ -47,8 +47,8 @@
...
@@ -47,8 +47,8 @@
// scripts/fuse_gtest.py depends on gtest's own header being #included
// scripts/fuse_gtest.py depends on gtest's own header being #included
// *unconditionally*. Therefore these #includes cannot be moved
// *unconditionally*. Therefore these #includes cannot be moved
// inside #if GTEST_HAS_PARAM_TEST.
// inside #if GTEST_HAS_PARAM_TEST.
#include
<
gtest/internal/gtest-param-util.h
>
#include
"
gtest/internal/gtest-param-util.h
"
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
#if GTEST_HAS_PARAM_TEST
#if GTEST_HAS_PARAM_TEST
...
...
include/gtest/internal/gtest-param-util-generated.h.pump
View file @
dac3e879
...
@@ -48,8 +48,8 @@ $var maxtuple = 10 $$ Maximum number of Combine arguments we want to support.
...
@@ -48,8 +48,8 @@ $var maxtuple = 10 $$ Maximum number of Combine arguments we want to support.
// scripts/fuse_gtest.py depends on gtest's own header being #included
// scripts/fuse_gtest.py depends on gtest's own header being #included
// *unconditionally*. Therefore these #includes cannot be moved
// *unconditionally*. Therefore these #includes cannot be moved
// inside #if GTEST_HAS_PARAM_TEST.
// inside #if GTEST_HAS_PARAM_TEST.
#include
<
gtest/internal/gtest-param-util.h
>
#include
"
gtest/internal/gtest-param-util.h
"
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
#if GTEST_HAS_PARAM_TEST
#if GTEST_HAS_PARAM_TEST
...
...
include/gtest/internal/gtest-param-util.h
View file @
dac3e879
...
@@ -41,10 +41,10 @@
...
@@ -41,10 +41,10 @@
// scripts/fuse_gtest.py depends on gtest's own header being #included
// scripts/fuse_gtest.py depends on gtest's own header being #included
// *unconditionally*. Therefore these #includes cannot be moved
// *unconditionally*. Therefore these #includes cannot be moved
// inside #if GTEST_HAS_PARAM_TEST.
// inside #if GTEST_HAS_PARAM_TEST.
#include
<
gtest/internal/gtest-internal.h
>
#include
"
gtest/internal/gtest-internal.h
"
#include
<
gtest/internal/gtest-linked_ptr.h
>
#include
"
gtest/internal/gtest-linked_ptr.h
"
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
#include
<
gtest/gtest-printers.h
>
#include
"
gtest/gtest-printers.h
"
#if GTEST_HAS_PARAM_TEST
#if GTEST_HAS_PARAM_TEST
...
...
include/gtest/internal/gtest-port.h
View file @
dac3e879
...
@@ -441,7 +441,7 @@
...
@@ -441,7 +441,7 @@
#if GTEST_HAS_TR1_TUPLE
#if GTEST_HAS_TR1_TUPLE
#if GTEST_USE_OWN_TR1_TUPLE
#if GTEST_USE_OWN_TR1_TUPLE
#include
<
gtest/internal/gtest-tuple.h
>
#include
"
gtest/internal/gtest-tuple.h
"
#elif GTEST_OS_SYMBIAN
#elif GTEST_OS_SYMBIAN
// On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to
// On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to
...
...
include/gtest/internal/gtest-string.h
View file @
dac3e879
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
#endif
#endif
#include <string.h>
#include <string.h>
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
#include <string>
#include <string>
...
...
include/gtest/internal/gtest-type-util.h
View file @
dac3e879
...
@@ -44,8 +44,8 @@
...
@@ -44,8 +44,8 @@
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
#include
<
gtest/internal/gtest-string.h
>
#include
"
gtest/internal/gtest-string.h
"
#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
...
...
Prev
1
2
3
4
5
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment