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

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 suggested gyp changes. 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 '../third_party/sqlite/sqlite.gyp:sqlite', 15 '../third_party/sqlite/sqlite.gyp:sqlite',
16 ], 16 ],
17 'export_dependent_settings': [
18 '../base/base.gyp:base',
19 ],
17 'defines': [ 'SQL_IMPLEMENTATION' ], 20 'defines': [ 'SQL_IMPLEMENTATION' ],
21 'direct_dependent_settings': {
22 'include_dirs': [
23 '..',
24 ],
25 },
18 'sources': [ 26 'sources': [
19 'connection.cc', 27 'connection.cc',
20 'connection.h', 28 'connection.h',
21 'error_delegate_util.cc', 29 'error_delegate_util.cc',
22 'error_delegate_util.h', 30 'error_delegate_util.h',
23 'init_status.h', 31 'init_status.h',
24 'meta_table.cc', 32 'meta_table.cc',
25 'meta_table.h', 33 'meta_table.h',
26 'statement.cc', 34 'statement.cc',
27 'statement.h', 35 'statement.h',
28 'transaction.cc', 36 'transaction.cc',
29 'transaction.h', 37 'transaction.h',
30 ], 38 ],
39 'include_dirs': [
40 '..',
41 ],
31 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 42 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
32 'msvs_disabled_warnings': [4267, ], 43 'msvs_disabled_warnings': [4267, ],
33 }, 44 },
34 { 45 {
46 'target_name': 'test_support_sql',
47 'type': 'static_library',
48 'dependencies': [
49 'sql',
50 '../base/base.gyp:base',
51 '../testing/gtest.gyp:gtest',
52 ],
53 'export_dependent_settings': [
erikwright (departed) 2013/06/17 17:42:30 nit, add 'include_dirs' -> '..' here too.
Scott Hess - ex-Googler 2013/06/17 20:54:59 I am taking this to mean an include_dirs stanza fo
54 'sql',
55 '../base/base.gyp:base',
56 ],
57 'sources': [
58 'test/scoped_error_ignorer.cc',
59 'test/scoped_error_ignorer.h',
60 ],
61 },
62 {
35 'target_name': 'sql_unittests', 63 'target_name': 'sql_unittests',
36 'type': '<(gtest_target_type)', 64 'type': '<(gtest_target_type)',
37 'dependencies': [ 65 'dependencies': [
38 'sql', 66 'sql',
67 'test_support_sql',
39 '../base/base.gyp:test_support_base', 68 '../base/base.gyp:test_support_base',
40 '../testing/gtest.gyp:gtest', 69 '../testing/gtest.gyp:gtest',
41 ], 70 ],
42 'sources': [ 71 'sources': [
43 'run_all_unittests.cc', 72 'run_all_unittests.cc',
44 'connection_unittest.cc', 73 'connection_unittest.cc',
45 'sqlite_features_unittest.cc', 74 'sqlite_features_unittest.cc',
46 'statement_unittest.cc', 75 'statement_unittest.cc',
47 'transaction_unittest.cc', 76 'transaction_unittest.cc',
48 ], 77 ],
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 'variables': { 112 'variables': {
84 'test_suite_name': 'sql_unittests', 113 'test_suite_name': 'sql_unittests',
85 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sql_unitt ests<(SHARED_LIB_SUFFIX)', 114 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sql_unitt ests<(SHARED_LIB_SUFFIX)',
86 }, 115 },
87 'includes': [ '../build/apk_test.gypi' ], 116 'includes': [ '../build/apk_test.gypi' ],
88 }, 117 },
89 ], 118 ],
90 }], 119 }],
91 ], 120 ],
92 } 121 }
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