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
33 additions
and
33 deletions
+33
-33
src/gtest-typed-test.cc
src/gtest-typed-test.cc
+2
-2
src/gtest.cc
src/gtest.cc
+2
-2
src/gtest_main.cc
src/gtest_main.cc
+1
-1
test/gtest-death-test_test.cc
test/gtest-death-test_test.cc
+4
-4
test/gtest-filepath_test.cc
test/gtest-filepath_test.cc
+2
-2
test/gtest-linked_ptr_test.cc
test/gtest-linked_ptr_test.cc
+2
-2
test/gtest-listener_test.cc
test/gtest-listener_test.cc
+1
-1
test/gtest-message_test.cc
test/gtest-message_test.cc
+2
-2
test/gtest-options_test.cc
test/gtest-options_test.cc
+1
-1
test/gtest-param-test2_test.cc
test/gtest-param-test2_test.cc
+1
-1
test/gtest-param-test_test.cc
test/gtest-param-test_test.cc
+1
-1
test/gtest-param-test_test.h
test/gtest-param-test_test.h
+1
-1
test/gtest-port_test.cc
test/gtest-port_test.cc
+3
-3
test/gtest-printers_test.cc
test/gtest-printers_test.cc
+2
-2
test/gtest-test-part_test.cc
test/gtest-test-part_test.cc
+2
-2
test/gtest-tuple_test.cc
test/gtest-tuple_test.cc
+2
-2
test/gtest-typed-test2_test.cc
test/gtest-typed-test2_test.cc
+1
-1
test/gtest-typed-test_test.cc
test/gtest-typed-test_test.cc
+1
-1
test/gtest-typed-test_test.h
test/gtest-typed-test_test.h
+1
-1
test/gtest-unittest-api_test.cc
test/gtest-unittest-api_test.cc
+1
-1
No files found.
src/gtest-typed-test.cc
View file @
dac3e879
...
@@ -29,8 +29,8 @@
...
@@ -29,8 +29,8 @@
//
//
// Author: wan@google.com (Zhanyong Wan)
// Author: wan@google.com (Zhanyong Wan)
#include
<
gtest/gtest-typed-test.h
>
#include
"
gtest/gtest-typed-test.h
"
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
namespace
testing
{
namespace
testing
{
namespace
internal
{
namespace
internal
{
...
...
src/gtest.cc
View file @
dac3e879
...
@@ -31,8 +31,8 @@
...
@@ -31,8 +31,8 @@
//
//
// The Google C++ Testing Framework (Google Test)
// The Google C++ Testing Framework (Google Test)
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
#include
<
gtest/gtest-spi.h
>
#include
"
gtest/gtest-spi.h
"
#include <ctype.h>
#include <ctype.h>
#include <math.h>
#include <math.h>
...
...
src/gtest_main.cc
View file @
dac3e879
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
#include <iostream>
#include <iostream>
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
GTEST_API_
int
main
(
int
argc
,
char
**
argv
)
{
GTEST_API_
int
main
(
int
argc
,
char
**
argv
)
{
std
::
cout
<<
"Running main() from gtest_main.cc
\n
"
;
std
::
cout
<<
"Running main() from gtest_main.cc
\n
"
;
...
...
test/gtest-death-test_test.cc
View file @
dac3e879
...
@@ -31,9 +31,9 @@
...
@@ -31,9 +31,9 @@
//
//
// Tests for death tests.
// Tests for death tests.
#include
<
gtest/gtest-death-test.h
>
#include
"
gtest/gtest-death-test.h
"
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
#include
<
gtest/internal/gtest-filepath.h
>
#include
"
gtest/internal/gtest-filepath.h
"
using
testing
::
internal
::
AlwaysFalse
;
using
testing
::
internal
::
AlwaysFalse
;
using
testing
::
internal
::
AlwaysTrue
;
using
testing
::
internal
::
AlwaysTrue
;
...
@@ -52,7 +52,7 @@ using testing::internal::AlwaysTrue;
...
@@ -52,7 +52,7 @@ using testing::internal::AlwaysTrue;
#include <signal.h>
#include <signal.h>
#include <stdio.h>
#include <stdio.h>
#include
<
gtest/gtest-spi.h
>
#include
"
gtest/gtest-spi.h
"
// Indicates that this translation unit is part of Google Test's
// Indicates that this translation unit is part of Google Test's
// implementation. It must come before gtest-internal-inl.h is
// implementation. It must come before gtest-internal-inl.h is
...
...
test/gtest-filepath_test.cc
View file @
dac3e879
...
@@ -38,8 +38,8 @@
...
@@ -38,8 +38,8 @@
// build or make-files for some existing Google Test clients. Do not
// build or make-files for some existing Google Test clients. Do not
// #include this file anywhere else!
// #include this file anywhere else!
#include
<
gtest/internal/gtest-filepath.h
>
#include
"
gtest/internal/gtest-filepath.h
"
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
// Indicates that this translation unit is part of Google Test's
// Indicates that this translation unit is part of Google Test's
// implementation. It must come before gtest-internal-inl.h is
// implementation. It must come before gtest-internal-inl.h is
...
...
test/gtest-linked_ptr_test.cc
View file @
dac3e879
...
@@ -30,10 +30,10 @@
...
@@ -30,10 +30,10 @@
// Authors: Dan Egnor (egnor@google.com)
// Authors: Dan Egnor (egnor@google.com)
// Ported to Windows: Vadim Berman (vadimb@google.com)
// Ported to Windows: Vadim Berman (vadimb@google.com)
#include
<
gtest/internal/gtest-linked_ptr.h
>
#include
"
gtest/internal/gtest-linked_ptr.h
"
#include <stdlib.h>
#include <stdlib.h>
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
namespace
{
namespace
{
...
...
test/gtest-listener_test.cc
View file @
dac3e879
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
// This file verifies Google Test event listeners receive events at the
// This file verifies Google Test event listeners receive events at the
// right times.
// right times.
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
#include <vector>
#include <vector>
using
::
testing
::
AddGlobalTestEnvironment
;
using
::
testing
::
AddGlobalTestEnvironment
;
...
...
test/gtest-message_test.cc
View file @
dac3e879
...
@@ -31,9 +31,9 @@
...
@@ -31,9 +31,9 @@
//
//
// Tests for the Message class.
// Tests for the Message class.
#include
<
gtest/gtest-message.h
>
#include
"
gtest/gtest-message.h
"
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
namespace
{
namespace
{
...
...
test/gtest-options_test.cc
View file @
dac3e879
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
// make-files on Windows and other platforms. Do not #include this file
// make-files on Windows and other platforms. Do not #include this file
// anywhere else!
// anywhere else!
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
#if GTEST_OS_WINDOWS_MOBILE
#if GTEST_OS_WINDOWS_MOBILE
#include <windows.h>
#include <windows.h>
...
...
test/gtest-param-test2_test.cc
View file @
dac3e879
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
// Tests for Google Test itself. This verifies that the basic constructs of
// Tests for Google Test itself. This verifies that the basic constructs of
// Google Test work.
// Google Test work.
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
#include "test/gtest-param-test_test.h"
#include "test/gtest-param-test_test.h"
...
...
test/gtest-param-test_test.cc
View file @
dac3e879
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
// generators objects produce correct parameter sequences and that
// generators objects produce correct parameter sequences and that
// Google Test runtime instantiates correct tests from those sequences.
// Google Test runtime instantiates correct tests from those sequences.
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
#if GTEST_HAS_PARAM_TEST
#if GTEST_HAS_PARAM_TEST
...
...
test/gtest-param-test_test.h
View file @
dac3e879
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#ifndef GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
#ifndef GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
#define GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
#define GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
#if GTEST_HAS_PARAM_TEST
#if GTEST_HAS_PARAM_TEST
...
...
test/gtest-port_test.cc
View file @
dac3e879
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
//
//
// This file tests the internal cross-platform support utilities.
// This file tests the internal cross-platform support utilities.
#include
<
gtest/internal/gtest-port.h
>
#include
"
gtest/internal/gtest-port.h
"
#include <stdio.h>
#include <stdio.h>
...
@@ -41,8 +41,8 @@
...
@@ -41,8 +41,8 @@
#include <utility> // For std::pair and std::make_pair.
#include <utility> // For std::pair and std::make_pair.
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
#include
<
gtest/gtest-spi.h
>
#include
"
gtest/gtest-spi.h
"
// Indicates that this translation unit is part of Google Test's
// Indicates that this translation unit is part of Google Test's
// implementation. It must come before gtest-internal-inl.h is
// implementation. It must come before gtest-internal-inl.h is
...
...
test/gtest-printers_test.cc
View file @
dac3e879
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
//
//
// This file tests the universal value printer.
// This file tests the universal value printer.
#include
<
gtest/gtest-printers.h
>
#include
"
gtest/gtest-printers.h
"
#include <ctype.h>
#include <ctype.h>
#include <limits.h>
#include <limits.h>
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
#include <utility>
#include <utility>
#include <vector>
#include <vector>
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
// hash_map and hash_set are available on Windows.
// hash_map and hash_set are available on Windows.
#if GTEST_OS_WINDOWS
#if GTEST_OS_WINDOWS
...
...
test/gtest-test-part_test.cc
View file @
dac3e879
...
@@ -30,9 +30,9 @@
...
@@ -30,9 +30,9 @@
// Author: mheule@google.com (Markus Heule)
// Author: mheule@google.com (Markus Heule)
//
//
#include
<
gtest/gtest-test-part.h
>
#include
"
gtest/gtest-test-part.h
"
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
using
testing
::
Message
;
using
testing
::
Message
;
using
testing
::
Test
;
using
testing
::
Test
;
...
...
test/gtest-tuple_test.cc
View file @
dac3e879
...
@@ -29,9 +29,9 @@
...
@@ -29,9 +29,9 @@
//
//
// Author: wan@google.com (Zhanyong Wan)
// Author: wan@google.com (Zhanyong Wan)
#include
<
gtest/internal/gtest-tuple.h
>
#include
"
gtest/internal/gtest-tuple.h
"
#include <utility>
#include <utility>
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
namespace
{
namespace
{
...
...
test/gtest-typed-test2_test.cc
View file @
dac3e879
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#include <vector>
#include <vector>
#include "test/gtest-typed-test_test.h"
#include "test/gtest-typed-test_test.h"
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
#if GTEST_HAS_TYPED_TEST_P
#if GTEST_HAS_TYPED_TEST_P
...
...
test/gtest-typed-test_test.cc
View file @
dac3e879
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
#include <vector>
#include <vector>
#include "test/gtest-typed-test_test.h"
#include "test/gtest-typed-test_test.h"
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
using
testing
::
Test
;
using
testing
::
Test
;
...
...
test/gtest-typed-test_test.h
View file @
dac3e879
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#ifndef GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
#ifndef GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
#define GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
#define GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
#if GTEST_HAS_TYPED_TEST_P
#if GTEST_HAS_TYPED_TEST_P
...
...
test/gtest-unittest-api_test.cc
View file @
dac3e879
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
// This file contains tests verifying correctness of data provided via
// This file contains tests verifying correctness of data provided via
// UnitTest's public methods.
// UnitTest's public methods.
#include
<
gtest/gtest.h
>
#include
"
gtest/gtest.h
"
#include <string.h> // For strcmp.
#include <string.h> // For strcmp.
#include <algorithm>
#include <algorithm>
...
...
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