Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(646)

Side by Side Diff: testing/gtest.gyp

Issue 10387218: Make GlobalDescriptors::MaybeGet return -1 when the key is not found. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modifying the MULTIPROCESS_TEST_MAIN macro so it can be passed a setup method. Created 8 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'gtest', 8 'target_name': 'gtest',
9 'type': 'static_library', 9 'type': 'static_library',
10 'sources': [ 10 'sources': [
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 ['os_posix == 1', { 66 ['os_posix == 1', {
67 'defines': [ 67 'defines': [
68 # gtest isn't able to figure out when RTTI is disabled for gcc 68 # gtest isn't able to figure out when RTTI is disabled for gcc
69 # versions older than 4.3.2, and assumes it's enabled. Our Mac 69 # versions older than 4.3.2, and assumes it's enabled. Our Mac
70 # and Linux builds disable RTTI, and cannot guarantee that the 70 # and Linux builds disable RTTI, and cannot guarantee that the
71 # compiler will be 4.3.2. or newer. The Mac, for example, uses 71 # compiler will be 4.3.2. or newer. The Mac, for example, uses
72 # 4.2.1 as that is the latest available on that platform. gtest 72 # 4.2.1 as that is the latest available on that platform. gtest
73 # must be instructed that RTTI is disabled here, and for any 73 # must be instructed that RTTI is disabled here, and for any
74 # direct dependents that might include gtest headers. 74 # direct dependents that might include gtest headers.
75 'GTEST_HAS_RTTI=0', 75 'GTEST_HAS_RTTI=0',
76 'OS_POSIX=1',
76 ], 77 ],
77 'direct_dependent_settings': { 78 'direct_dependent_settings': {
78 'defines': [ 79 'defines': [
79 'GTEST_HAS_RTTI=0', 80 'GTEST_HAS_RTTI=0',
80 ], 81 ],
81 }, 82 },
82 }], 83 }],
83 ['clang==1 or OS=="android"', { 84 ['clang==1 or OS=="android"', {
84 # We want gtest features that use tr1::tuple, but we currently 85 # We want gtest features that use tr1::tuple, but we currently
85 # don't support the variadic templates used by libstdc++'s 86 # don't support the variadic templates used by libstdc++'s
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 { 136 {
136 'target_name': 'gtest_prod', 137 'target_name': 'gtest_prod',
137 'toolsets': ['host', 'target'], 138 'toolsets': ['host', 'target'],
138 'type': 'none', 139 'type': 'none',
139 'sources': [ 140 'sources': [
140 'gtest/include/gtest/gtest_prod.h', 141 'gtest/include/gtest/gtest_prod.h',
141 ], 142 ],
142 }, 143 },
143 ], 144 ],
144 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698