eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fuse gtest-spi.h into the resulting header.

Browse Source 
Previously this was fused into the source file, but this prevents users of the
fused file from using those utilities directly.
This commit is contained in:
Kalon Mills 2019-05-30 10:49:49 -07:00
parent 8ffb7e5c88
commit 6044c267e8
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
googletest/scripts/fuse_gtest_files.py
View File

@ -172,6 +172,7 @@ def FuseGTestH(gtest_root, output_dir):
output_file.write(line) output_file.write(line)
ProcessFile(GTEST_H_SEED) ProcessFile(GTEST_H_SEED)
ProcessFile(GTEST_SPI_H_SEED)
output_file.close() output_file.close()
@ -193,12 +194,7 @@ def FuseGTestAllCcToFile(gtest_root, output_file):
for line in open(os.path.join(gtest_root, gtest_source_file), 'r'): for line in open(os.path.join(gtest_root, gtest_source_file), 'r'):
m = INCLUDE_GTEST_FILE_REGEX.match(line) m = INCLUDE_GTEST_FILE_REGEX.match(line)
if m: if m:
if 'include/' + m.group(1) == GTEST_SPI_H_SEED: # It's '#include "gtest/foo.h"'.
# It's '#include "gtest/gtest-spi.h"'. This file is not
# #included by "gtest/gtest.h", so we need to process it.
ProcessFile(GTEST_SPI_H_SEED)
else:
# It's '#include "gtest/foo.h"' where foo is not gtest-spi.
# We treat it as '#include "gtest/gtest.h"', as all other # We treat it as '#include "gtest/gtest.h"', as all other
# gtest headers are being fused into gtest.h and cannot be # gtest headers are being fused into gtest.h and cannot be
# #included directly. # #included directly.