diff options
author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 05:14:30 +0000 |
---|---|---|
committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 05:14:30 +0000 |
commit | 53d4e7dae39ef543467e4b6a04c3fc30814f29b4 (patch) | |
tree | 62507c08edeff6daab9d9333c599c7bffd7aa1e3 /chrome/chrome.gyp | |
parent | f781782dd67077478e117c61dca4ea5eefce3544 (diff) | |
download | chromium_src-53d4e7dae39ef543467e4b6a04c3fc30814f29b4.zip chromium_src-53d4e7dae39ef543467e4b6a04c3fc30814f29b4.tar.gz chromium_src-53d4e7dae39ef543467e4b6a04c3fc30814f29b4.tar.bz2 |
Un-reverting 26919, and disabling worker-cloneports since it is flaky.
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/232001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r-- | chrome/chrome.gyp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index d3eb237..80c834b 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3942,6 +3942,10 @@ ], }], ['OS=="mac"', { + 'sources': [ + 'app/keystone_glue.h', + 'app/keystone_glue.m', + ], 'sources!': [ # TODO(port) 'app/chrome_main_uitest.cc', @@ -3994,7 +3998,6 @@ 'common/logging_chrome_uitest.cc', 'test/ui/npapi_uitest.cc', 'test/ui/sandbox_uitests.cc', - 'worker/worker_uitest.cc', ], }], ], |