native_client_sdk/src/tests/nacl_io_test/example.dsc - Issue 1559463002: [NaCl SDK] Don't include gtest/gmock in library form

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: native_client_sdk/src/tests/nacl_io_test/example.dsc

Issue 1559463002: [NaCl SDK] Don't include gtest/gmock in library form (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

« no previous file with comments | « native_client_sdk/src/tests/nacl_io_socket_test/socket_test.cc ('k') | native_client_sdk/src/tests/sdk_util_test/example.dsc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: native_client_sdk/src/tests/nacl_io_test/example.dsc

diff --git a/native_client_sdk/src/tests/nacl_io_test/example.dsc b/native_client_sdk/src/tests/nacl_io_test/example.dsc

index 0a1055dd5ee0ba0f75bc0775137034fd6b536cc5..ee48428d8b29cf2de128258716f18f9b519ec3f6 100644

--- a/native_client_sdk/src/tests/nacl_io_test/example.dsc

+++ b/native_client_sdk/src/tests/nacl_io_test/example.dsc

@@ -62,14 +62,25 @@

'tty_test.cc',

'DEPS': ['ppapi_simple_cpp', 'nacl_io'],

- 'LIBS': ['ppapi_simple_cpp', 'ppapi_cpp', 'gmock', 'nacl_io', 'ppapi', 'gtest', 'pthread'],

- 'INCLUDES': ["."],

+ 'LIBS': ['ppapi_simple_cpp', 'ppapi_cpp', 'nacl_io', 'ppapi', 'pthread'],

+ 'INCLUDES': [

+ '.',

+ '../../src/gtest/include',

+ '../../src/gtest',

+ '../../src/gmock/include',

+ '../../src/gmock'

+ ],

+ 'EXTRA_SOURCES' : [

+ '../../src/gtest/src/gtest-all.cc',

+ '../../src/gmock/src/gmock-all.cc'

+ ],

'CXXFLAGS': ['-Wno-sign-compare'],

}

'DATA': [

'example.js'

'DEST': 'tests',

'NAME': 'nacl_io_test',

'TITLE': 'NaCl IO test',