testing/gtest.gypi - Issue 2169193002: Re-land: Roll gtest.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: testing/gtest.gypi

Issue 2169193002: Re-land: Roll gtest. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: testing/gtest.gypi

diff --git a/testing/gtest.gypi b/testing/gtest.gypi

index ca12e1b1ee1a498a4a2445e83afcc31b3d67f6eb..c2a3c356e16814387af183fa81c6fcf357617d56 100644

--- a/testing/gtest.gypi

+++ b/testing/gtest.gypi

@@ -25,14 +25,34 @@

'gtest/include/gtest/internal/gtest-string.h',

'gtest/include/gtest/internal/gtest-tuple.h',

'gtest/include/gtest/internal/gtest-type-util.h',

- 'gtest/src/gtest-death-test.cc',

- 'gtest/src/gtest-filepath.cc',

- 'gtest/src/gtest-internal-inl.h',

- 'gtest/src/gtest-port.cc',

- 'gtest/src/gtest-printers.cc',

- 'gtest/src/gtest-test-part.cc',

- 'gtest/src/gtest-typed-test.cc',

- 'gtest/src/gtest.cc',

+ 'third_party/googletest/googletest/include/gtest/gtest-death-test.h',

+ 'third_party/googletest/googletest/include/gtest/gtest-message.h',

+ 'third_party/googletest/googletest/include/gtest/gtest-param-test.h',

+ 'third_party/googletest/googletest/include/gtest/gtest-printers.h',

+ 'third_party/googletest/googletest/include/gtest/gtest-spi.h',

+ 'third_party/googletest/googletest/include/gtest/gtest-test-part.h',

+ 'third_party/googletest/googletest/include/gtest/gtest-typed-test.h',

+ 'third_party/googletest/googletest/include/gtest/gtest.h',

+ 'third_party/googletest/googletest/include/gtest/gtest_pred_impl.h',

+ 'third_party/googletest/googletest/include/gtest/gtest_prod.h',

+ 'third_party/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h',

+ 'third_party/googletest/googletest/include/gtest/internal/gtest-filepath.h',

+ 'third_party/googletest/googletest/include/gtest/internal/gtest-internal.h',

+ 'third_party/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h',

+ 'third_party/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h',

+ 'third_party/googletest/googletest/include/gtest/internal/gtest-param-util.h',

+ 'third_party/googletest/googletest/include/gtest/internal/gtest-port.h',

+ 'third_party/googletest/googletest/include/gtest/internal/gtest-string.h',

+ 'third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h',

+ 'third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h',

+ 'third_party/googletest/googletest/src/gtest-death-test.cc',

+ 'third_party/googletest/googletest/src/gtest-filepath.cc',

+ 'third_party/googletest/googletest/src/gtest-internal-inl.h',

+ 'third_party/googletest/googletest/src/gtest-port.cc',

+ 'third_party/googletest/googletest/src/gtest-printers.cc',

+ 'third_party/googletest/googletest/src/gtest-test-part.cc',

+ 'third_party/googletest/googletest/src/gtest-typed-test.cc',

+ 'third_party/googletest/googletest/src/gtest.cc',

'multiprocess_func_list.cc',

'multiprocess_func_list.h',

'platform_test.h',

« no previous file with comments | « testing/gtest.gyp ('k') | testing/gtest/BUILD.gn » ('j') | no next file with comments »