diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 00:33:05 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 00:33:05 +0000 |
| commit | e6dd4519db3282f11d16c86817fea2dd50d75d2b (patch) | |
| tree | 99dd631f3c31190f1b0c8d6e18ff511e48c09328 /chrome/chrome.gyp | |
| parent | f3018df5f0253bd5dcbe3b67f65d889ebd09ab82 (diff) | |
| download | chromium_src-e6dd4519db3282f11d16c86817fea2dd50d75d2b.zip chromium_src-e6dd4519db3282f11d16c86817fea2dd50d75d2b.tar.gz chromium_src-e6dd4519db3282f11d16c86817fea2dd50d75d2b.tar.bz2 | |
Move automated_ui_test_test to ui_tests from a library so it actually gets run.
Trivial tweaks to get most of it to build on Linux.
BUG=none
TEST=run ui_tests --gtest_filter=AutomatedUITestBase, verify that six to eight are enabled and all pass
Review URL: http://codereview.chromium.org/125142
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 7d4bf10..5a2bc4e 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2947,7 +2947,6 @@ 'sources': [ 'test/automated_ui_tests/automated_ui_test_base.cc', 'test/automated_ui_tests/automated_ui_test_base.h', - 'test/automated_ui_tests/automated_ui_test_test.cc', 'test/testing_browser_process.h', 'test/ui/javascript_test_util.cc', 'test/ui/npapi_test_helper.cc', @@ -2966,8 +2965,6 @@ }], ['OS!="win"', { 'sources!': [ - 'test/automated_ui_tests/automated_ui_test_base.cc', - 'test/automated_ui_tests/automated_ui_test_test.cc', 'test/ui/npapi_test_helper.cc', ], }], @@ -3094,6 +3091,7 @@ 'test/accessibility/tab_impl.cc', 'test/accessibility/tab_impl.h', 'test/automation/automation_proxy_uitest.cc', + 'test/automated_ui_tests/automated_ui_test_test.cc', 'test/chrome_process_util_uitest.cc', 'test/reliability/page_load_test.cc', 'test/reliability/page_load_test.h', |