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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 7396013: Linux: revive a mysteriously disabled test and add tests for the GNOME Keyring native backend. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
« chrome/browser/password_manager/native_backend_gnome_x.h ('K') | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 92796)
+++ chrome/chrome_tests.gypi (working copy)
@@ -1489,12 +1489,14 @@
'browser/password_manager/encryptor_password_mac_unittest.cc',
'browser/password_manager/encryptor_unittest.cc',
'browser/password_manager/login_database_unittest.cc',
+ 'browser/password_manager/native_backend_gnome_x_unittest.cc',
'browser/password_manager/password_form_data.cc',
'browser/password_manager/password_form_manager_unittest.cc',
'browser/password_manager/password_manager_unittest.cc',
'browser/password_manager/password_store_default_unittest.cc',
'browser/password_manager/password_store_mac_unittest.cc',
'browser/password_manager/password_store_win_unittest.cc',
+ 'browser/password_manager/password_store_x_unittest.cc',
'browser/plugin_exceptions_table_model_unittest.cc',
'browser/policy/asynchronous_policy_loader_unittest.cc',
'browser/policy/asynchronous_policy_provider_unittest.cc',
@@ -1827,7 +1829,7 @@
'browser/ui/content_settings/content_setting_bubble_model_unittest.cc',
'browser/ui/content_settings/content_setting_image_model_unittest.cc',
'browser/ui/find_bar/find_backend_unittest.cc',
- 'browser/ui/gtk/accelerators_gtk_unittest.cc',
+ 'browser/ui/gtk/accelerators_gtk_unittest.cc',
'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
'browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc',
@@ -2086,18 +2088,21 @@
],
}],
['chromeos==1', {
- 'sources/': [
+ 'sources!': [
Evan Martin 2011/07/18 15:31:00 IIRC you need to use sources/ in some weird circum
Mike Mammarella 2011/07/19 00:20:35 Hmm. I just figured this was somebody copy pasting
+ 'browser/notifications/desktop_notifications_unittest.cc',
+ 'browser/password_manager/native_backend_gnome_x_unittest.cc',
# TODO(thestig) Enable PrintPreviewUI tests on CrOS when
# print preview is enabled on CrOS.
- ['exclude', 'browser/notifications/desktop_notifications_unittest.cc'],
- ['exclude', 'browser/ui/webui/print_preview_ui_unittest.cc'],
+ 'browser/ui/webui/print_preview_ui_unittest.cc',
],
}, { # else: chromeos == 0
+ 'sources!': [
+ 'browser/policy/device_policy_cache_unittest.cc',
+ 'browser/policy/enterprise_install_attributes_unittest.cc',
+ ],
'sources/': [
['exclude', '^browser/chromeos/'],
- ['exclude', '^browser/policy/device_policy_cache_unittest.cc'],
- ['exclude', '^browser/policy/enterprise_install_attributes_unittest.cc' ],
- ['exclude', '^browser/ui/webui/chromeos/login'],
+ ['exclude', '^browser/ui/webui/chromeos/login/'],
['exclude', '^browser/ui/webui/chromeos/imageburner/'],
],
}],
@@ -2110,17 +2115,32 @@
}],
['toolkit_views==1', {
'sources!': [
- 'browser/ui/gtk/accelerators_gtk_unittest.cc',
- 'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
- 'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
- 'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
- 'browser/ui/gtk/gtk_expanded_container_unittest.cc',
- 'browser/ui/gtk/gtk_theme_service_unittest.cc',
- 'browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc',
- 'browser/ui/gtk/reload_button_gtk_unittest.cc',
- 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
+ 'browser/ui/gtk/accelerators_gtk_unittest.cc',
+ 'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
+ 'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
+ 'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
+ 'browser/ui/gtk/gtk_expanded_container_unittest.cc',
+ 'browser/ui/gtk/gtk_theme_service_unittest.cc',
+ 'browser/ui/gtk/omnibox/omnibox_popup_view_gtk_unittest.cc',
+ 'browser/ui/gtk/reload_button_gtk_unittest.cc',
+ 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
],
}],
+ ['chromeos==0', {
+ 'conditions': [
+ ['use_gnome_keyring==1', {
+ # We use a few convenience functions directly, so link directly.
+ 'dependencies': [
+ '../build/linux/system.gyp:gnome-keyring-direct',
+ ],
+ }, {
+ # Disable the GNOME Keyring tests if GNOME Keyring is disabled.
+ 'sources!': [
+ 'browser/password_manager/native_backend_gnome_x_unittest.cc',
+ ],
+ }],
+ ],
+ }],
],
'dependencies': [
'../build/linux/system.gyp:gtk',
@@ -2286,10 +2306,12 @@
'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
],
}, { # else: toolkit_views == 0
+ 'sources!': [
+ 'browser/extensions/key_identifier_conversion_views_unittest.cc',
+ ],
'sources/': [
['exclude', '^browser/ui/views/'],
['exclude', '^../views/'],
- ['exclude', '^browser/extensions/key_identifier_conversion_views_unittest.cc'],
],
}],
['use_openssl==1', {
« chrome/browser/password_manager/native_backend_gnome_x.h ('K') | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698