diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-28 21:54:54 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-28 21:54:54 +0000 |
commit | 0f79893bfd2a3c5bcc20bd32ad9b509f0e157115 (patch) | |
tree | 5f1beae95511cadcc73e61cb2905e272b5f772dd /chrome/chrome_tests.gypi | |
parent | a30d4f91f32506e82e9edd45133632a5340f9920 (diff) | |
download | chromium_src-0f79893bfd2a3c5bcc20bd32ad9b509f0e157115.zip chromium_src-0f79893bfd2a3c5bcc20bd32ad9b509f0e157115.tar.gz chromium_src-0f79893bfd2a3c5bcc20bd32ad9b509f0e157115.tar.bz2 |
Revert "Revert 231359 "GTTF: make sharding_supervisor.py use --brave-new...""
This reverts commit 94094b6f47c929e5ebaa54eb2627c93e7367399f.
Looks like interactive_ui_tests passed on the next build that didn't have the revert yet.
TBR=maruel
BUG=236893
Review URL: https://codereview.chromium.org/49843003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r-- | chrome/chrome_tests.gypi | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 0497476..6936edd 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -74,6 +74,24 @@ ], 'targets': [ { + 'target_name': 'test_support_chrome', + 'type': 'static_library', + 'dependencies': [ + 'test_support_common', + '../testing/gtest.gyp:gtest', + ], + 'export_dependent_settings': [ + 'test_support_common', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'test/base/chrome_test_launcher.cc', + 'test/base/chrome_test_launcher.h', + ], + }, + { 'target_name': 'test_support_ui_runner', 'type': 'static_library', 'dependencies': [ @@ -151,6 +169,7 @@ 'common/extensions/api/api.gyp:api', 'debugger', 'renderer', + 'test_support_chrome', 'test_support_common', # NOTE: don't add test_support_ui, no more UITests. See # http://crbug.com/137365 @@ -178,7 +197,6 @@ ], 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER', - 'INTERACTIVE_TESTS', ], 'variables': { 'win_use_external_manifest': 1, @@ -266,7 +284,6 @@ 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc', 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h', 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc', - 'test/base/chrome_test_launcher.cc', 'test/base/interactive_test_utils.cc', 'test/base/interactive_test_utils.h', 'test/base/interactive_test_utils_aura.cc', @@ -275,6 +292,7 @@ 'test/base/interactive_test_utils_mac.mm', 'test/base/interactive_test_utils_views.cc', 'test/base/interactive_test_utils_win.cc', + 'test/base/interactive_ui_tests_main.cc', 'test/base/view_event_test_base.cc', 'test/base/view_event_test_base.h', 'test/ppapi/ppapi_interactive_browsertest.cc', @@ -922,6 +940,7 @@ 'common/extensions/api/api.gyp:api', 'renderer', 'test/perf/perf_test.gyp:*', + 'test_support_chrome', 'test_support_common', 'test_support_unit', '../base/base.gyp:base', @@ -1541,9 +1560,9 @@ 'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc', 'renderer/translate/translate_helper_browsertest.cc', 'renderer/translate/translate_script_browsertest.cc', + 'test/base/browser_tests_main.cc', 'test/base/chrome_render_view_test.cc', 'test/base/chrome_render_view_test.h', - 'test/base/chrome_test_launcher.cc', 'test/base/web_ui_browsertest.cc', 'test/base/web_ui_browsertest.h', 'test/base/in_process_browser_test_browsertest.cc', @@ -2000,6 +2019,7 @@ 'chrome_resources.gyp:packed_resources', 'renderer', 'test/perf/perf_test.gyp:*', + 'test_support_chrome', 'test_support_common', '../base/base.gyp:base', '../base/base.gyp:base_i18n', @@ -2036,9 +2056,9 @@ 'browser/extensions/extension_apitest.cc', 'browser/extensions/extension_browsertest.cc', 'browser/extensions/extension_test_notification_observer.cc', + 'test/base/browser_tests_main.cc', 'test/base/chrome_render_view_test.cc', 'test/base/chrome_render_view_test.h', - 'test/base/chrome_test_launcher.cc', 'test/perf/browser_perf_test.cc', 'test/perf/browser_perf_test.h', 'test/perf/rendering/throughput_tests.cc', @@ -2267,6 +2287,7 @@ 'common', 'common/extensions/api/api.gyp:api', 'renderer', + 'test_support_chrome', 'test_support_common', '../net/net.gyp:net', '../printing/printing.gyp:printing', @@ -2295,7 +2316,7 @@ 'app/chrome_dll.rc', 'app/chrome_dll_resource.h', 'app/chrome_version.rc.version', - 'test/base/chrome_test_launcher.cc', + 'test/base/browser_tests_main.cc', 'test/data/resource.rc', 'browser/sync/test/integration/apps_helper.cc', 'browser/sync/test/integration/apps_helper.h', @@ -2447,6 +2468,7 @@ 'chrome', 'common/extensions/api/api.gyp:api', 'test/perf/perf_test.gyp:*', + 'test_support_chrome', 'test_support_common', '../skia/skia.gyp:skia', '../sync/sync.gyp:sync', @@ -2498,7 +2520,7 @@ 'browser/sync/test/integration/sync_test.h', 'browser/sync/test/integration/typed_urls_helper.cc', 'browser/sync/test/integration/typed_urls_helper.h', - 'test/base/chrome_test_launcher.cc', + 'test/base/browser_tests_main.cc', 'test/data/resource.rc', ], 'conditions': [ |