commit 8b487b73aa8e392507fd823c8552441fe1d58212
author Martin Kreichgauer <martinkr@google.com> Mon Apr 03 16:07:27 2017 -0700
committer Adam Langley <agl@google.com> Mon Apr 03 23:12:33 2017 +0000
tree 244cb8600a63e2d0580fc647576cf4d2a74c9c5f
parent 67bb45f44be61b54ab4830c222ed1f77bb53f6d9

util/generate_build_files.py: Filter test runner sources from BUILD files.

Change-Id: I6eb13647843b124b0cfeb7ea592736a80d723836
Reviewed-on: https://boringssl-review.googlesource.com/14624
Reviewed-by: Adam Langley <agl@google.com>

util/generate_build_files.py

diff --git a/util/generate_build_files.py b/util/generate_build_files.py
index a3435f2..5af3d4f 100644
--- a/util/generate_build_files.py
+++ b/util/generate_build_files.py
@@ -459,6 +459,14 @@
   return True
 
 
+def NoTestRunnerFiles(dent, is_dir):
+  """Filter function that can be passed to FindCFiles or FindHeaderFiles in
+  order to exclude test runner files."""
+  # NOTE(martinkr): This prevents .h/.cc files in src/ssl/test/runner, which
+  # are in their own subpackage, from being included in boringssl/BUILD files.
+  return not is_dir or dent != 'runner'
+
+
 def NotGTestMain(dent, is_dir):
   return dent != 'gtest_main.cc'
 
@@ -625,7 +633,7 @@
                                     NotGTestMain)
   test_support_h_files = (
       FindHeaderFiles(os.path.join('src', 'crypto', 'test'), AllFiles) +
-      FindHeaderFiles(os.path.join('src', 'ssl', 'test'), AllFiles))
+      FindHeaderFiles(os.path.join('src', 'ssl', 'test'), NoTestRunnerFiles))
 
   test_c_files = []
   crypto_test_files = ['src/crypto/test/gtest_main.cc']