summaryrefslogtreecommitdiffstats
path: root/chrome/test/unit
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 18:54:50 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 18:54:50 +0000
commit4ab4b0f66a346a4e48601d51693170d9adc85d96 (patch)
treeb74eb578456bf14a343b658586ec9898471872a4 /chrome/test/unit
parent43f55738f0922bc479ee00b5d3d3c264e080f512 (diff)
downloadchromium_src-4ab4b0f66a346a4e48601d51693170d9adc85d96.zip
chromium_src-4ab4b0f66a346a4e48601d51693170d9adc85d96.tar.gz
chromium_src-4ab4b0f66a346a4e48601d51693170d9adc85d96.tar.bz2
Porting unit tests in chrome/
- Make following unit tests compile and pass on Linux: browser/ command_updater_unittest.cc metrics/metrics_log_unittest.cc search_engines/template_url_parser_unittest.cc search_engines/template_url_prepopulate_data_unittest.cc - Add renderer/renderer_main_unittest.cc to list of compiled files (currently stubbed out on Linux) - Remove DebuggerWrapper stubs and make more files from browser/debugger build on Linux. - Sync XCode project file. - Misc cleanups needed for GCC. Review URL: http://codereview.chromium.org/21181 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/unit')
-rw-r--r--chrome/test/unit/unit_tests.scons8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index eaa1afa..814cea8 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -37,6 +37,7 @@ env.Prepend(
LIBS = [
'browser',
'common',
+ 'debugger',
'plugin',
'renderer',
'sqlite',
@@ -67,7 +68,6 @@ if env.Bit('windows'):
# TODO(port): to be ported to Mac and Linux, or else
# moved to the Windows-specific list below.
'browser_views',
- 'debugger',
'jscre',
'test_chrome_plugin',
'views',
@@ -255,6 +255,7 @@ input_files = ChromeFileList([
'$CHROME_DIR/renderer/render_widget_unittest.cc',
'$CHROME_DIR/renderer/render_process_unittest.cc',
'$CHROME_DIR/renderer/render_thread_unittest.cc',
+ '$CHROME_DIR/renderer/renderer_main_unittest.cc',
# test_infrastructure
'$CHROME_DIR/renderer/mock_render_process.h',
@@ -381,7 +382,6 @@ if not env.Bit('windows'):
'$CHROME_DIR/browser/bookmarks/bookmark_table_model_unittest.cc',
'$CHROME_DIR/browser/bookmarks/bookmark_utils_unittest.cc',
'$CHROME_DIR/browser/browser_commands_unittest.cc',
- '$CHROME_DIR/browser/command_updater_unittest.cc',
'$CHROME_DIR/browser/download/download_manager_unittest.cc',
'$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
'$CHROME_DIR/browser/download/save_package_unittest.cc',
@@ -394,7 +394,6 @@ if not env.Bit('windows'):
'$CHROME_DIR/browser/importer/firefox_importer_unittest.cc',
'$CHROME_DIR/browser/importer/importer_unittest.cc',
'$CHROME_DIR/browser/login_prompt_unittest.cc',
- '$CHROME_DIR/browser/metrics/metrics_log_unittest.cc',
'$CHROME_DIR/browser/renderer_host/render_widget_host_unittests.cc',
'$CHROME_DIR/browser/navigation_controller_unittest.cc',
'$CHROME_DIR/browser/net/dns_master_unittest.cc',
@@ -409,9 +408,6 @@ if not env.Bit('windows'):
'$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc',
'$CHROME_DIR/browser/rlz/rlz_unittest.cc',
'$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc',
- '$CHROME_DIR/browser/search_engines/template_url_parser_unittest.cc',
- '$CHROME_DIR/browser/search_engines/template_url_prepopulate_data_unittest.cc',
- '$CHROME_DIR/browser/search_engines/template_url_unittest.cc',
'$CHROME_DIR/browser/sessions/session_backend_unittest.cc',
'$CHROME_DIR/browser/sessions/session_service_test_helper.cc',
'$CHROME_DIR/browser/sessions/session_service_unittest.cc',