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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sql/connection_unittest.cc ('k') | sql/test/scoped_error_ignorer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sql/sql.gyp
diff --git a/sql/sql.gyp b/sql/sql.gyp
index 86cfbc9160c71ebb123acbca8aba9453c80d0e43..4e7b101a3530cd8544fe380283ba5a84c7684b32 100644
--- a/sql/sql.gyp
+++ b/sql/sql.gyp
@@ -12,6 +12,7 @@
'type': '<(component)',
'dependencies': [
'../base/base.gyp:base',
+ '../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
'../third_party/sqlite/sqlite.gyp:sqlite',
],
'defines': [ 'SQL_IMPLEMENTATION' ],
@@ -32,10 +33,27 @@
'msvs_disabled_warnings': [4267, ],
},
{
+ 'target_name': 'test_support_sql',
+ 'type': 'static_library',
+ 'dependencies': [
+ 'sql',
+ '../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
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'export_dependent_settings': [
+ 'sql',
+ ],
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
+ 'sources': [
+ 'test/scoped_error_ignorer.cc',
+ 'test/scoped_error_ignorer.h',
+ ],
+ },
+ {
'target_name': 'sql_unittests',
'type': '<(gtest_target_type)',
'dependencies': [
'sql',
+ 'test_support_sql',
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
],
« 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