Skip to content

G
googletest
Commit 6044c267 by Kalon Mills
Options

Fuse gtest-spi.h into the resulting header.

Previously this was fused into the source file, but this prevents users of the fused file from using those utilities directly.
parent 8ffb7e5c
Showing with 2 additions and 6 deletions
googletest/scripts/fuse_gtest_files.py
...@@ -172,6 +172,7 @@ def FuseGTestH(gtest_root, output_dir): ...@@ -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): ...@@ -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.
......
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