summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 14:55:37 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 14:55:37 +0000
commit6238f3032c4085318b4a092b9a0fec29bb37b728 (patch)
tree634a025fd225e02851d50f82a447e282e084a5d5 /chrome/chrome.gyp
parentf7da4b786f75d9df469111b09e2a4c679a0c3a47 (diff)
downloadchromium_src-6238f3032c4085318b4a092b9a0fec29bb37b728.zip
chromium_src-6238f3032c4085318b4a092b9a0fec29bb37b728.tar.gz
chromium_src-6238f3032c4085318b4a092b9a0fec29bb37b728.tar.bz2
Added missing layout tests along with associated rebaselinings.
Updated DEPS to include common resource files needed by tests, and add APIs to ui_layout_test to allow specifying resource files to copy. Disabled non-working tests so we can enable worker_uitests on Mac/Linux. BUG=22174 TEST=worker_uitest Review URL: http://codereview.chromium.org/211051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 881fdff..0846bcb 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3940,6 +3940,10 @@
],
}],
['OS=="mac"', {
+ 'sources': [
+ 'app/keystone_glue.h',
+ 'app/keystone_glue.m',
+ ],
'sources!': [
# TODO(port)
'app/chrome_main_uitest.cc',
@@ -3992,7 +3996,6 @@
'common/logging_chrome_uitest.cc',
'test/ui/npapi_uitest.cc',
'test/ui/sandbox_uitests.cc',
- 'worker/worker_uitest.cc',
],
}],
],