Chromium Code Reviews
[email protected] (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Side by Side Diff: sql/sql.gyp

Issue 16664005: [sql] Framework for allowing tests to handle errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Erik's comments, plus lazy instance for global. Created 7 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
« no previous file with comments | « sql/connection_unittest.cc ('k') | sql/test/scoped_error_ignorer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'sql', 11 'target_name': 'sql',
12 'type': '<(component)', 12 'type': '<(component)',
13 'dependencies': [ 13 'dependencies': [
14 '../base/base.gyp:base', 14 '../base/base.gyp:base',
15 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
Scott Hess - ex-Googler 2013/06/13 20:41:03 Having the scoper own the callback and pass a _poi
15 '../third_party/sqlite/sqlite.gyp:sqlite', 16 '../third_party/sqlite/sqlite.gyp:sqlite',
16 ], 17 ],
17 'defines': [ 'SQL_IMPLEMENTATION' ], 18 'defines': [ 'SQL_IMPLEMENTATION' ],
18 'sources': [ 19 'sources': [
19 'connection.cc', 20 'connection.cc',
20 'connection.h', 21 'connection.h',
21 'error_delegate_util.cc', 22 'error_delegate_util.cc',
22 'error_delegate_util.h', 23 'error_delegate_util.h',
23 'init_status.h', 24 'init_status.h',
24 'meta_table.cc', 25 'meta_table.cc',
25 'meta_table.h', 26 'meta_table.h',
26 'statement.cc', 27 'statement.cc',
27 'statement.h', 28 'statement.h',
28 'transaction.cc', 29 'transaction.cc',
29 'transaction.h', 30 'transaction.h',
30 ], 31 ],
31 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 32 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
32 'msvs_disabled_warnings': [4267, ], 33 'msvs_disabled_warnings': [4267, ],
33 }, 34 },
34 { 35 {
36 'target_name': 'test_support_sql',
37 'type': 'static_library',
38 'dependencies': [
39 'sql',
40 '../base/base.gyp:test_support_base',
Scott Hess - ex-Googler 2013/06/13 20:41:03 I don't understand gyp at all. If I don't include
erikwright (departed) 2013/06/13 22:58:06 You use base/basictypes.h and base/bind.h, so you
Scott Hess - ex-Googler 2013/06/13 23:58:39 I'm not sure I understand this. base.gyp has:
erikwright (departed) 2013/06/17 17:42:29 GYP is so complicated, and there is so much boiler
41 '../testing/gtest.gyp:gtest',
42 ],
43 'export_dependent_settings': [
44 'sql',
45 ],
Scott Hess - ex-Googler 2013/06/13 20:41:03 Do you know if this clause is necessary? I just c
erikwright (departed) 2013/06/13 22:58:06 The purpose of this is because your dependents dep
Scott Hess - ex-Googler 2013/06/13 23:58:39 Makes sense. Does this imply that the 'sql' targe
erikwright (departed) 2013/06/17 17:42:29 I did a git grep and confirm that only base/ and s
46 'sources': [
47 'test/scoped_error_ignorer.cc',
48 'test/scoped_error_ignorer.h',
49 ],
50 },
51 {
35 'target_name': 'sql_unittests', 52 'target_name': 'sql_unittests',
36 'type': '<(gtest_target_type)', 53 'type': '<(gtest_target_type)',
37 'dependencies': [ 54 'dependencies': [
38 'sql', 55 'sql',
56 'test_support_sql',
39 '../base/base.gyp:test_support_base', 57 '../base/base.gyp:test_support_base',
40 '../testing/gtest.gyp:gtest', 58 '../testing/gtest.gyp:gtest',
41 ], 59 ],
42 'sources': [ 60 'sources': [
43 'run_all_unittests.cc', 61 'run_all_unittests.cc',
44 'connection_unittest.cc', 62 'connection_unittest.cc',
45 'sqlite_features_unittest.cc', 63 'sqlite_features_unittest.cc',
46 'statement_unittest.cc', 64 'statement_unittest.cc',
47 'transaction_unittest.cc', 65 'transaction_unittest.cc',
48 ], 66 ],
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 'variables': { 101 'variables': {
84 'test_suite_name': 'sql_unittests', 102 'test_suite_name': 'sql_unittests',
85 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sql_unitt ests<(SHARED_LIB_SUFFIX)', 103 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sql_unitt ests<(SHARED_LIB_SUFFIX)',
86 }, 104 },
87 'includes': [ '../build/apk_test.gypi' ], 105 'includes': [ '../build/apk_test.gypi' ],
88 }, 106 },
89 ], 107 ],
90 }], 108 }],
91 ], 109 ],
92 } 110 }
OLDNEW
« no previous file with comments | « sql/connection_unittest.cc ('k') | sql/test/scoped_error_ignorer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698