diff options
Diffstat (limited to 'tests/build_tests.gyp')
| -rw-r--r-- | tests/build_tests.gyp | 53 |
1 files changed, 30 insertions, 23 deletions
diff --git a/tests/build_tests.gyp b/tests/build_tests.gyp index c80a4444..d485c834 100644 --- a/tests/build_tests.gyp +++ b/tests/build_tests.gyp @@ -14,6 +14,14 @@ 'sources': [ '../third_party/googletest/src/gtest-all.cc', ], + 'defines': [ + '_VARIADIC_MAX=10', + ], + 'direct_dependent_settings': { + 'defines': [ + '_VARIADIC_MAX=10', + ], + }, }, { 'target_name': 'gmock', @@ -26,6 +34,14 @@ 'sources': [ '../third_party/googlemock/src/gmock-all.cc', ], + 'defines': [ + '_VARIADIC_MAX=10', + ], + 'direct_dependent_settings': { + 'defines': [ + '_VARIADIC_MAX=10', + ], + }, }, { 'target_name': 'preprocessor_tests', @@ -35,6 +51,12 @@ 'gtest', 'gmock', ], + 'variables': { + 'ANGLE_DIR': '..', + }, + 'includes': [ + 'preprocessor_tests/preprocessor_tests.gypi', + ], 'include_dirs': [ '../src/compiler/preprocessor', '../third_party/googletest/include', @@ -42,35 +64,22 @@ ], 'sources': [ '../third_party/googlemock/src/gmock_main.cc', - 'preprocessor_tests/char_test.cpp', - 'preprocessor_tests/comment_test.cpp', - 'preprocessor_tests/define_test.cpp', - 'preprocessor_tests/error_test.cpp', - 'preprocessor_tests/extension_test.cpp', - 'preprocessor_tests/identifier_test.cpp', - 'preprocessor_tests/if_test.cpp', - 'preprocessor_tests/input_test.cpp', - 'preprocessor_tests/location_test.cpp', - 'preprocessor_tests/MockDiagnostics.h', - 'preprocessor_tests/MockDirectiveHandler.h', - 'preprocessor_tests/number_test.cpp', - 'preprocessor_tests/operator_test.cpp', - 'preprocessor_tests/pragma_test.cpp', - 'preprocessor_tests/PreprocessorTest.cpp', - 'preprocessor_tests/PreprocessorTest.h', - 'preprocessor_tests/space_test.cpp', - 'preprocessor_tests/token_test.cpp', - 'preprocessor_tests/version_test.cpp', ], }, { 'target_name': 'compiler_tests', 'type': 'executable', 'dependencies': [ - '../src/build_angle.gyp:translator_glsl', + '../src/build_angle.gyp:translator_static', 'gtest', 'gmock', ], + 'variables': { + 'ANGLE_DIR': '..', + }, + 'includes': [ + 'compiler_tests/compiler_tests.gypi', + ], 'include_dirs': [ '../include', '../src', @@ -78,9 +87,7 @@ '../third_party/googlemock/include', ], 'sources': [ - '../third_party/googlemock/src/gmock_main.cc', - 'compiler_tests/ExpressionLimit_test.cpp', - 'compiler_tests/VariablePacker_test.cpp', + 'compiler_tests/compiler_test_main.cpp', ], }, ], |