Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 3f6665bd58fc53e52239fdc56bec5d932fb3ef61..974affbd6b730fddcb0f05321e1dcfd0499df8dd 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -328,10 +328,12 @@ |
'chrome_resources.gyp:theme_resources', |
'test_support_common', |
'../skia/skia.gyp:skia', |
+ '../base/base.gyp:run_all_unittests', |
'../testing/gtest.gyp:gtest', |
], |
'export_dependent_settings': [ |
'test_support_common', |
+ '../base/base.gyp:run_all_unittests', |
Ryan Sleevi
2012/03/16 02:45:25
And the motivation for this (and on 443)
akalin
2012/03/16 06:59:20
rendered moot.
|
], |
'include_dirs': [ |
'..', |
@@ -346,7 +348,6 @@ |
'test/ui/javascript_test_util.cc', |
'test/ui/npapi_test_helper.cc', |
'test/ui/npapi_test_helper.h', |
- 'test/ui/run_all_unittests.cc', |
Ryan Sleevi
2012/03/16 02:48:45
This is a different test harness.
akalin
2012/03/16 06:59:20
Indeed! reverted.
|
'test/ui/ui_layout_test.cc', |
'test/ui/ui_layout_test.h', |
'test/ui/ui_perf_test.cc', |
@@ -434,26 +435,16 @@ |
'chrome_resources.gyp:chrome_resources', |
'chrome_resources.gyp:chrome_strings', |
'test_support_common', |
+ '../base/base.gyp:run_all_unittests', |
'../skia/skia.gyp:skia', |
'../testing/gtest.gyp:gtest', |
], |
+ 'export_dependent_settings': [ |
+ '../base/base.gyp:run_all_unittests', |
+ ], |
'include_dirs': [ |
'..', |
], |
- 'sources': [ |
- 'test/base/run_all_unittests.cc', |
Ryan Sleevi
2012/03/16 02:48:45
As is this
akalin
2012/03/16 06:59:20
Reverted this too.
|
- ], |
- 'conditions': [ |
- ['toolkit_uses_gtk == 1', { |
- 'dependencies': [ |
- # Needed for the following #include chain: |
- # test/base/run_all_unittests.cc |
- # test/base/chrome_test_suite.h |
- # gtk/gtk.h |
- '../build/linux/system.gyp:gtk', |
- ], |
- }], |
- ], |
}, |
{ |
'target_name': 'automated_ui_tests', |
@@ -1125,7 +1116,7 @@ |
'type': 'executable', |
'dependencies': [ |
'chromedriver_lib', |
- '../base/base.gyp:test_support_base', |
+ '../base/base.gyp:run_all_unittests', |
'../testing/gtest.gyp:gtest', |
'../skia/skia.gyp:skia', |
], |
@@ -1133,7 +1124,6 @@ |
'..', |
], |
'sources': [ |
- '../base/test/run_all_unittests.cc', |
'test/webdriver/commands/set_timeout_commands_unittest.cc', |
'test/webdriver/frame_path_unittest.cc', |
'test/webdriver/http_response_unittest.cc', |
@@ -3619,7 +3609,6 @@ |
'target_name': 'sync_unit_tests', |
'type': 'executable', |
'sources': [ |
- '../base/test/run_all_unittests.cc', |
'browser/sync/api/sync_change_unittest.cc', |
'browser/sync/api/sync_error_unittest.cc', |
'browser/sync/internal_api/change_record_unittest.cc', |
@@ -3642,7 +3631,7 @@ |
], |
'dependencies': [ |
'../sync/sync.gyp:sync_tests', |
- '../base/base.gyp:test_support_base', |
+ '../base/base.gyp:run_all_unittests', |
'../jingle/jingle.gyp:notifier_test_util', |
'../net/net.gyp:net', |
'../net/net.gyp:net_test_support', |