diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 06:32:48 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 06:32:48 +0000 |
| commit | 5ddfee61ac6cbd489106a8ca8b8db4fda2dc8479 (patch) | |
| tree | 75767ad45618ea9bd77e08b43968cd5f760d0fc9 /chrome/chrome_tests.gypi | |
| parent | 11f76c7e6b989b9683a88f5fe080f66b7d08f4ea (diff) | |
| download | chromium_src-5ddfee61ac6cbd489106a8ca8b8db4fda2dc8479.zip chromium_src-5ddfee61ac6cbd489106a8ca8b8db4fda2dc8479.tar.gz chromium_src-5ddfee61ac6cbd489106a8ca8b8db4fda2dc8479.tar.bz2 | |
Clean up out-of-process test runner.
This change merges 3 files into one, and only moves code
without changing behavior. More changes will follow.
This is a preparation before fixing the bug.
BUG=59330
TEST=browser_tests
Review URL: http://codereview.chromium.org/3912003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 81f1bf5..0e5faa1 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -312,9 +312,7 @@ 'test/interactive_ui/npapi_interactive_test.cc', 'test/interactive_ui/view_event_test_base.cc', 'test/interactive_ui/view_event_test_base.h', - 'test/test_launcher/out_of_proc_test_runner.cc', - 'test/test_launcher/test_runner.cc', - 'test/test_launcher/test_runner.h', + 'test/out_of_proc_test_runner.cc', 'test/unit/chrome_test_suite.h', ], 'conditions': [ @@ -2019,11 +2017,9 @@ 'test/automation/dom_automation_browsertest.cc', 'test/in_process_browser_test.cc', 'test/in_process_browser_test.h', + 'test/out_of_proc_test_runner.cc', 'test/render_view_test.cc', 'test/render_view_test.h', - 'test/test_launcher/out_of_proc_test_runner.cc', - 'test/test_launcher/test_runner.cc', - 'test/test_launcher/test_runner.h', ], 'conditions': [ ['chromeos==0', { @@ -2186,9 +2182,7 @@ 'browser/safe_browsing/safe_browsing_test.cc', 'test/in_process_browser_test.cc', 'test/in_process_browser_test.h', - 'test/test_launcher/out_of_proc_test_runner.cc', - 'test/test_launcher/test_runner.cc', - 'test/test_launcher/test_runner.h', + 'test/out_of_proc_test_runner.cc', ], 'conditions': [ ['OS=="win"', { @@ -2652,9 +2646,7 @@ 'test/bookmark_load_observer.h', 'test/in_process_browser_test.cc', 'test/in_process_browser_test.h', - 'test/test_launcher/out_of_proc_test_runner.cc', - 'test/test_launcher/test_runner.cc', - 'test/test_launcher/test_runner.h', + 'test/out_of_proc_test_runner.cc', 'test/live_sync/bookmark_model_verifier.cc', 'test/live_sync/bookmark_model_verifier.h', 'test/live_sync/live_autofill_sync_test.h', |