client/client_test.gyp - Issue 1404033002: Switch googletest and googlemock to pull from the GitHub git repository

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: client/client_test.gyp

Issue 1404033002: Switch googletest and googlemock to pull from the GitHub git repository (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master

Patch Set: 71a26ac68b28 Created 5 years, 1 month 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: client/client_test.gyp

diff --git a/client/client_test.gyp b/client/client_test.gyp

index c684717357dd67c1bc81960607ec207047d100bd..85cdb5574c65dbba937e502ac6478303385f7c59 100644

--- a/client/client_test.gyp

+++ b/client/client_test.gyp

@@ -23,9 +23,9 @@

'dependencies': [

'client.gyp:crashpad_client',

'../test/test.gyp:crashpad_test',

- '../third_party/gmock/gmock.gyp:gmock',

+ '../third_party/gtest/gmock.gyp:gmock',

+ '../third_party/gtest/gmock.gyp:gmock_main',

scottmg 2015/11/11 04:04:11 gtest_main still exists, but you switched to gmock

Mark Mentovai 2015/11/11 14:58:35 scottmg wrote:

'../third_party/gtest/gtest.gyp:gtest',

- '../third_party/gtest/gtest.gyp:gtest_main',

'../third_party/mini_chromium/mini_chromium.gyp:base',

'../util/util.gyp:crashpad_util',

« no previous file with comments | « DEPS ('k') | test/test_test.gyp » ('j') | no next file with comments »