Skip to content

A
angle
Commit 1deca4fd by Geoff Lang
Options

Don't include the test main files in the source listings.

Since chrome adds the ANGLE test source directly to it's own projects, the main function is defined twice. Remove the main file from the source listings and only add it for our test executables. BUG=angle:568 Change-Id: I30b481a23d5de80341d7f339583a43ad2f4391bb Reviewed-on: https://chromium-review.googlesource.com/195345Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 834e8b77
Showing with 16 additions and 3 deletions
tests/compiler_tests/compiler_tests.gypi
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
{ {
'sources': 'sources':
[ [
'<!@(python <(angle_path)/enumerate_files.py <(angle_path)/tests/compiler_tests/ -types *.cpp *.h)' '<!@(python <(angle_path)/enumerate_files.py \
-dirs <(angle_path)/tests/compiler_tests \
-types *.cpp *.h \
-excludes */compiler_test_main.cpp)'
], ],
} }
tests/preprocessor_tests/preprocessor_tests.gypi
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
{ {
'sources': 'sources':
[ [
'<!@(python <(angle_path)/enumerate_files.py <(angle_path)/tests/preprocessor_tests/ -types *.cpp *.h)' '<!@(python <(angle_path)/enumerate_files.py \
-dirs <(angle_path)/tests/preprocessor_tests \
-types *.cpp *.h \
-excludes */preprocessor_test_main.cpp)'
], ],
} }
tests/tests.gyp
...@@ -78,6 +78,10 @@ ...@@ -78,6 +78,10 @@
'../build/common_defines.gypi', '../build/common_defines.gypi',
'preprocessor_tests/preprocessor_tests.gypi', 'preprocessor_tests/preprocessor_tests.gypi',
], ],
'sources':
[
'preprocessor_tests/preprocessor_test_main.cpp',
],
}, },
{ {
...@@ -101,6 +105,10 @@ ...@@ -101,6 +105,10 @@
'../build/common_defines.gypi', '../build/common_defines.gypi',
'compiler_tests/compiler_tests.gypi', 'compiler_tests/compiler_tests.gypi',
], ],
'sources':
[
'compiler_tests/compiler_test_main.cpp',
],
}, },
], ],
......
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