diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 20:37:41 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 20:37:41 +0000 |
| commit | 215a61222817f1fd7a07e91c60cdb73f8fe192a3 (patch) | |
| tree | f016639ec58de6d1449e899609683019e301578e /build | |
| parent | b0a39178d73b6592dcf24114e53947d070399bab (diff) | |
| download | chromium_src-215a61222817f1fd7a07e91c60cdb73f8fe192a3.zip chromium_src-215a61222817f1fd7a07e91c60cdb73f8fe192a3.tar.gz chromium_src-215a61222817f1fd7a07e91c60cdb73f8fe192a3.tar.bz2 | |
Linux: revive a mysteriously disabled test and add tests for the GNOME Keyring native backend.
In order to make the GNOME Keyring API mockable, I've substituted evil preprocessor macros with a slightly less evil scoping trick, and used it even when linking directly.
I'm not sure when password_store_x_unittest fell out of the gyp file, but it hasn't been compiled for some time apparently so it required a bit of cleanup to make it compile.
I also did a little unrelated cleanup in the gyp files and fixed typos in password_store_default_unittest.
BUG=none
Review URL: http://codereview.chromium.org/7396013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/system.gyp | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 6e8a8be..8d82eab 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -340,7 +340,7 @@ }]] }, { - 'target_name': 'gnome-keyring', + 'target_name': 'gnome_keyring', 'type': 'settings', 'conditions': [ ['use_gnome_keyring==1', { @@ -379,6 +379,39 @@ ], }, { + # The unit tests use a few convenience functions from the GNOME + # Keyring library directly. We ignore linux_link_gnome_keyring and + # link directly in this version of the target to allow this. + # *** Do not use this target in the main binary! *** + 'target_name': 'gnome_keyring_direct', + 'type': 'settings', + 'conditions': [ + ['use_gnome_keyring==1', { + 'direct_dependent_settings': { + 'cflags': [ + '<!@(<(pkg-config) --cflags gnome-keyring-1)', + ], + 'defines': [ + 'USE_GNOME_KEYRING', + ], + 'conditions': [ + ['linux_link_gnome_keyring==0', { + 'defines': ['DLOPEN_GNOME_KEYRING'], + }], + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)', + ], + 'libraries': [ + '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)', + ], + }, + }], + ], + }, + { 'target_name': 'dbus-glib', 'type': 'settings', 'direct_dependent_settings': { |