diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 22:18:10 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 22:18:10 +0000 |
| commit | 4350e321e41d0faa025ac516aad6365bc8e9a83f (patch) | |
| tree | 23d66544bf4dc0f62a20820f66ad2264b2323eee /sql/sql.gyp | |
| parent | 90392f8e3110e58c0367c4d87caa7f33709bff6c (diff) | |
| download | chromium_src-4350e321e41d0faa025ac516aad6365bc8e9a83f.zip chromium_src-4350e321e41d0faa025ac516aad6365bc8e9a83f.tar.gz chromium_src-4350e321e41d0faa025ac516aad6365bc8e9a83f.tar.bz2 | |
[sql] Framework for allowing tests to handle errors.
sql/ throws FATAL whenever it sees inappropriate calls, which makes
production code to handle errors hard to test. ScopedErrorIgnorer
provides a way for tests to signal that specific errors are expected
and will be handled.
As a first pass, code up some additional tests for some Raze() edge
cases, and modify things to pass those tests.
BUG=159490
Review URL: https://chromiumcodereview.appspot.com/16664005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sql/sql.gyp')
| -rw-r--r-- | sql/sql.gyp | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/sql/sql.gyp b/sql/sql.gyp index 86cfbc9..944defd 100644 --- a/sql/sql.gyp +++ b/sql/sql.gyp @@ -14,6 +14,9 @@ '../base/base.gyp:base', '../third_party/sqlite/sqlite.gyp:sqlite', ], + 'export_dependent_settings': [ + '../base/base.gyp:base', + ], 'defines': [ 'SQL_IMPLEMENTATION' ], 'sources': [ 'connection.cc', @@ -28,14 +31,48 @@ 'transaction.cc', 'transaction.h', ], + 'include_dirs': [ + '..', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '..', + ], + }, # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, { + 'target_name': 'test_support_sql', + 'type': 'static_library', + 'dependencies': [ + 'sql', + '../base/base.gyp:base', + '../testing/gtest.gyp:gtest', + ], + 'export_dependent_settings': [ + 'sql', + '../base/base.gyp:base', + ], + 'sources': [ + 'test/scoped_error_ignorer.cc', + 'test/scoped_error_ignorer.h', + ], + 'include_dirs': [ + '..', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '..', + ], + }, + }, + { 'target_name': 'sql_unittests', 'type': '<(gtest_target_type)', 'dependencies': [ 'sql', + 'test_support_sql', '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], |