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
f4e7727c
Commit
f4e7727c
authored
Feb 02, 2021
by
Abseil Team
Committed by
Dino Radaković
Feb 05, 2021
Browse files
Googletest export
Fix includes in fuse_gmock_files.py PiperOrigin-RevId: 355166403
parent
8c269618
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
googlemock/scripts/fuse_gmock_files.py
googlemock/scripts/fuse_gmock_files.py
+5
-6
No files found.
googlemock/scripts/fuse_gmock_files.py
View file @
f4e7727c
...
...
@@ -151,8 +151,7 @@ def FuseGMockH(gmock_root, output_dir):
else
:
m
=
gtest
.
INCLUDE_GTEST_FILE_REGEX
.
match
(
line
)
if
m
:
# '#include "third_party/googletest/googletest/
# include/gtest/foo.h"'.
# '#include "gtest/foo.h"'
# We translate it to "gtest/gtest.h", regardless of what foo is,
# since all gtest headers are fused into gtest/gtest.h.
...
...
@@ -188,11 +187,11 @@ def FuseGMockAllCcToFile(gmock_root, output_file):
for
line
in
fh
:
m
=
INCLUDE_GMOCK_FILE_REGEX
.
match
(
line
)
if
m
:
# '#include "gmock/foo.h"'
.
# '#include "gmock/foo.h"'
# We treat it as '#include "gmock/gmock.h"', as all other gmock
# headers are being fused into gmock.h and cannot be
# included directly. No need to
#include
#
"third_party/googletest/googlemock/
include
/
gmock/gmock.h"
# included directly. No need to
#
#
include
"
gmock/gmock.h"
# more than once.
if
GMOCK_H_SEED
not
in
processed_files
:
...
...
@@ -201,7 +200,7 @@ def FuseGMockAllCcToFile(gmock_root, output_file):
else
:
m
=
gtest
.
INCLUDE_GTEST_FILE_REGEX
.
match
(
line
)
if
m
:
# '#include "gtest/..."'
.
# '#include "gtest/..."'
# There is no need to #include gtest.h as it has been
# #included by gtest-all.cc.
...
...
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