Commit dac3e879 authored by zhanyong.wan's avatar zhanyong.wan
Browse files

Include gtest headers as user headers instead of system headers.

parent 88e0df62
...@@ -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.).
......
...@@ -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 {
......
...@@ -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 {
......
...@@ -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
......
...@@ -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
......
...@@ -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 {
......
...@@ -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 {
......
...@@ -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 {
......
...@@ -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.
......
...@@ -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.
// //
......
...@@ -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 {
......
...@@ -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 {
......
...@@ -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
......
...@@ -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 {
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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>
......
...@@ -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
......
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