Merge pull request #2268 from kalaxy/fuse_spi_in_header

Fuse gtest-spi.h into the resulting header.

googletest/scripts/fuse_gtest_files.py

@@ -172,6 +172,7 @@ def FuseGTestH(gtest_root, output_dir):
         output_file.write(line)
 
   ProcessFile(GTEST_H_SEED)
+  ProcessFile(GTEST_SPI_H_SEED)
   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'):
       m = INCLUDE_GTEST_FILE_REGEX.match(line)
       if m:
-        if 'include/' + m.group(1) == GTEST_SPI_H_SEED:
-          # 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.
+        # It's '#include "gtest/foo.h"'.
         # We treat it as '#include "gtest/gtest.h"', as all other
         # gtest headers are being fused into gtest.h and cannot be
         # #included directly.