From d831dc7147e9895185740f551fed7abe246e2adf Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 19 Oct 2015 16:04:22 -0700 Subject: Merge to XFA: Consolidate test support code. Original Review URL: https://codereview.chromium.org/1416713002 . (cherry picked from commit 6d34d056a7188b7ae9800fe3ceb68645e0442879) Conflicts: BUILD.gn samples/BUILD.gn samples/pdfium_test.cc samples/samples.gyp R=thestig@chromium.org Review URL: https://codereview.chromium.org/1413593003 . --- pdfium.gyp | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'pdfium.gyp') diff --git a/pdfium.gyp b/pdfium.gyp index 4d20f82f18..471e970cb3 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -763,6 +763,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest_main', '<(DEPTH)/testing/gtest.gyp:gtest', 'pdfium', + 'test_support', ], 'include_dirs': [ '<(DEPTH)' @@ -793,6 +794,7 @@ '<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gtest.gyp:gtest', 'pdfium', + 'test_support', ], 'include_dirs': [ '<(DEPTH)', @@ -811,8 +813,6 @@ 'testing/embedder_test.h', 'testing/embedder_test_mock_delegate.h', 'testing/embedder_test_timer_handling_delegate.h', - 'testing/fx_string_testhelpers.cpp', - 'testing/fx_string_testhelpers.h', ], 'conditions': [ ['pdf_enable_v8==1', { @@ -830,5 +830,34 @@ }], ], }, + { + 'target_name': 'test_support', + 'type': 'static_library', + 'dependencies': [ + '<(DEPTH)/testing/gmock.gyp:gmock', + '<(DEPTH)/testing/gtest.gyp:gtest', + ], + 'include_dirs': [ + '<(DEPTH)', + ], + 'sources': [ + 'testing/fx_string_testhelpers.cpp', + 'testing/fx_string_testhelpers.h', + 'testing/test_support.cpp', + 'testing/test_support.h', + ], + 'conditions': [ + ['pdf_enable_v8==1', { + 'include_dirs': [ + '<(DEPTH)/v8', + '<(DEPTH)/v8/include', + ], + 'dependencies': [ + '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', + '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform', + ], + }], + ], + }, ], } -- cgit v1.2.3