SCons rename: automated_ui_tests and ui_tests.

Review URL: http://codereview.chromium.org/8225

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4784 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 213 insertions, 241 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index 9e3d04e..d691dd9 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -389,18 +389,6 @@ if env_flat['PLATFORM'] == 'win32':
   env_test.Object('test/test_file_util.cc',
                   CPPPATH=['..'] + env['CPPPATH'])
 
-test_sconscript_files = [
-]
-
-# TODO(port)
-if env['PLATFORM'] == 'win32':
-  test_sconscript_files.extend([
-      'SConscript.automated_ui_tests',
-      'SConscript.ui_tests',
-  ])
-
-env.SConscript(test_sconscript_files, exports=['env_test'])
-
 sconscript_files = [
     'test/chrome_plugin/SConscript',
     'tools/test/image_diff/SConscript',
diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests
deleted file mode 100644
index e8a973d..0000000
--- a/chrome/SConscript.automated_ui_tests
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-env_test.Prepend(
-    CPPPATH = [
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '$LIBXML_DIR/include',
-        '$LIBXML_DIR/DerivedSources/include',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '$CHROME_SRC_DIR',
-        '$GTEST_DIR/include',
-        'third_party/wtl/include',
-        'tools/build/win',
-    ],
-    CPPDEFINES = [
-        'LIBXML_STATIC',
-    ],
-    LIBS = [
-        'automation',
-        'base',
-        'base_gfx',
-        'browser',
-        'browser_views',
-        'common',
-        'googleurl',
-        'gtest',
-        env_test['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
-        'libpng',
-        'libxml',
-        'modp_b64',
-        'net',
-        'skia',
-        'zlib',
-
-        'comsupp',
-        'oleacc',
-        'psapi',
-        'rpcrt4',
-    ],
-    LINKFLAGS = [
-        '/INCREMENTAL',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-
-        '/MANIFEST',
-        '/DELAYLOAD:"ws2_32.dll"',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/DEBUG',
-        '/MACHINE:X86',
-        '/FIXED:No',
-    ],
-)
-
-test_files = [
-    'test/automated_ui_tests/automated_ui_tests.cc',
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-]
-
-exe = env_test.ChromeTestProgram('automated_ui_tests',  test_files)
-
-i = env_test.Install('$TARGET_ROOT', exe)
-Alias('chrome', i)
-
diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests
deleted file mode 100644
index 0526cd5..0000000
--- a/chrome/SConscript.ui_tests
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-Import('env_test')
-
-env_test = env_test.Clone()
-
-env_test.Prepend(
-    CPPPATH = [
-        '$CHROME_DIR/app/resources',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '$CHROME_SRC_DIR',
-        '$GTEST_DIR/include',
-        'third_party/wtl/include',
-        '$LIBXSLT_DIR',
-        '$LIBXML_DIR/include',
-        '$LIBXML_DIR/DerivedSources/include',
-        'tools/build/win',
-    ],
-    CPPDEFINES = [
-        'LIBXSLT_STATIC',
-        'LIBXML_STATIC',
-        'PNG_USER_CONFIG',
-        'CHROME_PNG_WRITE_SUPPORT',
-        'UI_TEST',
-        'UNIT_TEST',
-    ],
-    LIBS = [
-        'libxml',
-        'googleurl',
-        'skia',
-        'libpng',
-        'npapi_layout_test_plugin',
-        'gtest',
-        'base_gfx',
-        env_test['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
-        'zlib',
-        'modp_b64',
-        'net',
-        'bzip2',
-        'base',
-        'npapi_test_plugin',
-    ],
-)
-
-if env_test['PLATFORM'] == 'win32':
-  env_test.Prepend(
-      LINKFLAGS = [
-          '/INCREMENTAL',
-
-          '/safeseh',
-          '/dynamicbase',
-          '/ignore:4199',
-          '/nxcompat',
-
-          '/MANIFEST',
-          '/DELAYLOAD:"ws2_32.dll"',
-          '/DELAYLOAD:"dwmapi.dll"',
-          '/DELAYLOAD:"uxtheme.dll"',
-
-          '/DEBUG',
-          '/MACHINE:X86',
-          '/FIXED:No',
-      ],
-      LIBS = [
-          # TODO(sgk):  to be ported to Mac and Linux
-          'sdch',
-
-          'comsupp.lib',
-          'oleacc.lib',
-          'rpcrt4.lib',
-          'winmm.lib',
-      ],
-  )
-
-libs = [
-    'test/security_tests/security_tests.lib',
-    'common/common.lib',
-    'browser/browser.lib',
-    'browser/views/browser_views.lib',
-    'test/automation/automation.lib',
-]
-
-ui_test_files = [
-    'app/chrome_main_uitest.cc',
-    'browser/browser_uitest.cc',
-    'browser/crash_recovery_uitest.cc',
-    'browser/download/download_uitest.cc',
-    'browser/download/save_page_uitest.cc',
-    'browser/errorpage_uitest.cc',
-    'browser/history/redirect_uitest.cc',
-    'browser/iframe_uitest.cc',
-    'browser/images_uitest.cc',
-    'browser/interstitial_page_uitest.cc',
-    'browser/locale_tests_uitest.cc',
-    'browser/login_prompt_uitest.cc',
-    'browser/metrics_service_uitest.cc',
-    'browser/printing/printing_layout_uitest.cc',
-    'browser/resource_dispatcher_host_uitest.cc',
-    'browser/sanity_uitest.cc',
-    'browser/session_history_uitest.cc',
-    'browser/session_restore_uitest.cc',
-    'browser/ssl_uitest.cc',
-    'browser/tab_restore_uitest.cc',
-    'browser/view_source_uitest.cc',
-    'common/logging_chrome_uitest.cc',
-    'common/net/cache_uitest.cc',
-    'common/pref_service_uitest.cc',
-    'test/accessibility/accessibility_tests.cc',
-    'test/accessibility/accessibility_util.cc',
-    'test/accessibility/browser_impl.cc',
-    'test/accessibility/keyboard_util.cc',
-    'test/accessibility/registry_util.cc',
-    'test/accessibility/tab_impl.cc',
-    'test/automation/automation_proxy_uitest.cc',
-    'test/perf/mem_usage.cc',
-    'test/reliability/page_load_test$OBJSUFFIX',
-    'test/ui/inspector_controller_uitest.cc',
-    'test/ui/layout_plugin_uitest.cpp',
-    'test/ui/npapi_uitest.cpp',
-    'test/ui/omnibox_uitest.cc',
-    'test/ui/run_all_unittests.cc',
-    'test/ui/sandbox_uitests.cc',
-    'test/ui/ui_test.cc',
-    'test/ui/ui_test_suite.cc',
-    'test/ui/history_uitest.cc',
-    'test/ui/npapi_test_helper.cc',
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-    '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
-]
-
-if env_test['PLATFORM'] == 'win32':
-  ui_test_files.extend([
-      'browser/views/find_bar_win_interactive_uitest.cc',
-      'browser/views/find_bar_win_uitest.cc',
-  ])
-
-ui_tests = env_test.ChromeTestProgram('ui_tests',  ui_test_files + libs)
-
-i = env_test.Install('$TARGET_ROOT', ui_tests)
-Alias('chrome', i)
-
diff --git a/chrome/chrome.scons b/chrome/chrome.scons
index f3754a9..8018e07 100644
--- a/chrome/chrome.scons
+++ b/chrome/chrome.scons
@@ -13,18 +13,22 @@ sconscript_files = [
 
     'browser/browser.scons',
     'browser/debugger/debugger.scons',
-    'test/interactive_ui/interactive_ui_tests.scons',
-    'test/unit/unit_tests.scons',
     'common/common.scons',
     'common/ipc_tests.scons',
     'plugin/plugin.scons',
     'renderer/renderer.scons',
+    'test/automated_ui_tests/automated_ui_tests.scons',
+    'test/interactive_ui/interactive_ui_tests.scons',
+    'test/ui/ui_tests.scons',
+    'test/unit/unit_tests.scons',
 ]
 
 if env['PLATFORM'] != 'win32':
   remove_files = [
       'browser/debugger/debugger.scons',
+      'test/automated_ui_tests/automated_ui_tests.scons',
       'test/interactive_ui/interactive_ui_tests.scons',
+      'test/ui/ui_tests.scons',
   ]
   for remove in remove_files:
     sconscript_files.remove(remove)
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.scons b/chrome/test/automated_ui_tests/automated_ui_tests.scons
new file mode 100644
index 0000000..668754e
--- /dev/null
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.scons
@@ -0,0 +1,75 @@
+# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+Import('env')
+
+env = env.Clone()
+
+env.SConscript([
+    '$BASE_DIR/using_base.scons',
+    '$BASE_DIR/gfx/using_base_gfx.scons',
+    '$CHROME_DIR/third_party/wtl/using_wtl.scons',
+    '$CHROME_SRC_DIR/build/using_googleurl.scons',
+    '$GTEST_DIR/../using_gtest.scons',
+    '$ICU38_DIR/using_icu38.scons',
+    '$LIBPNG_DIR/using_libpng.scons',
+    '$LIBXML_DIR/using_libxml.scons',
+    '$NET_DIR/using_net.scons',
+    '$SKIA_DIR/using_skia.scons',
+    '$ZLIB_DIR/using_zlib.scons',
+], {'env':env})
+
+env.Prepend(
+    CPPPATH = [
+        '$CHROME_SRC_DIR',
+    ],
+    LIBS = [
+        'automation',
+        'browser',
+        'browser_views',
+        'common',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Prepend(
+      CPPPATH = [
+          '$CHROME_DIR/tools/build/win',
+      ],
+      LINKFLAGS = [
+          '/INCREMENTAL',
+
+          '/safeseh',
+          '/dynamicbase',
+          '/ignore:4199',
+          '/nxcompat',
+
+          '/MANIFEST',
+          '/DELAYLOAD:"ws2_32.dll"',
+          '/DELAYLOAD:"dwmapi.dll"',
+          '/DELAYLOAD:"uxtheme.dll"',
+
+          '/DEBUG',
+          '/MACHINE:X86',
+          '/FIXED:No',
+      ],
+      LIBS = [
+          'comsupp',
+          'oleacc',
+          'psapi',
+          'rpcrt4',
+      ],
+  )
+
+input_files = [
+    'automated_ui_tests.cc',
+
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    '$CHROME_DIR/test/perf/mem_usage$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+]
+
+env.ChromeTestProgram('automated_ui_tests',  input_files)
diff --git a/chrome/test/ui/ui_tests.scons b/chrome/test/ui/ui_tests.scons
new file mode 100644
index 0000000..219c249
--- /dev/null
+++ b/chrome/test/ui/ui_tests.scons
@@ -0,0 +1,132 @@
+# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+Import('env')
+
+env = env.Clone()
+
+env.SConscript([
+    '$BASE_DIR/using_base.scons',
+    '$BASE_DIR/gfx/using_base_gfx.scons',
+    '$BZIP2_DIR/using_bzip2.scons',
+    '$CHROME_DIR/third_party/wtl/using_wtl.scons',
+    '$CHROME_SRC_DIR/build/using_googleurl.scons',
+    '$GTEST_DIR/../using_gtest.scons',
+    '$ICU38_DIR/using_icu38.scons',
+    '$LIBPNG_DIR/using_libpng.scons',
+    '$LIBXML_DIR/using_libxml.scons',
+    '$LIBXSLT_DIR/using_libxslt.scons',
+    '$MODP_B64_DIR/using_modp_b64.scons',
+    '$NET_DIR/using_net.scons',
+    #'$NPAPI_DIR/using_npapi.scons',
+    '$SDCH_DIR/using_sdch.scons',
+    '$SKIA_DIR/using_skia.scons',
+    '$ZLIB_DIR/using_zlib.scons',
+], {'env':env})
+
+env.Prepend(
+    CPPPATH = [
+        '$CHROME_DIR/app/resources',
+        '$CHROME_SRC_DIR',
+    ],
+    CPPDEFINES = [
+        'UI_TEST',
+    ],
+    LIBS = [
+        'automation',
+        'browser',
+        'browser_views',
+        'common',
+        'npapi_layout_test_plugin',
+        'npapi_test_plugin',
+        'security_tests',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Prepend(
+      CPPPATH = [
+          '$CHROME_DIR/tools/build/win',
+      ],
+      LINKFLAGS = [
+          '/INCREMENTAL',
+
+          '/safeseh',
+          '/dynamicbase',
+          '/ignore:4199',
+          '/nxcompat',
+
+          '/MANIFEST',
+          '/DELAYLOAD:"ws2_32.dll"',
+          '/DELAYLOAD:"dwmapi.dll"',
+          '/DELAYLOAD:"uxtheme.dll"',
+
+          '/DEBUG',
+          '/MACHINE:X86',
+          '/FIXED:No',
+      ],
+      LIBS = [
+          'comsupp',
+          'oleacc',
+          'rpcrt4',
+          'winmm',
+      ],
+  )
+
+ui_test_files = [
+    'inspector_controller_uitest.cc',
+    'layout_plugin_uitest.cpp',
+    'npapi_uitest.cpp',
+    'omnibox_uitest.cc',
+    'run_all_unittests.cc',
+    'sandbox_uitests.cc',
+    'ui_test.cc',
+    'ui_test_suite.cc',
+    'history_uitest.cc',
+    'npapi_test_helper.cc',
+
+    '$CHROME_DIR/app/chrome_main_uitest.cc',
+    '$CHROME_DIR/browser/browser_uitest.cc',
+    '$CHROME_DIR/browser/crash_recovery_uitest.cc',
+    '$CHROME_DIR/browser/download/download_uitest.cc',
+    '$CHROME_DIR/browser/download/save_page_uitest.cc',
+    '$CHROME_DIR/browser/errorpage_uitest.cc',
+    '$CHROME_DIR/browser/history/redirect_uitest.cc',
+    '$CHROME_DIR/browser/iframe_uitest.cc',
+    '$CHROME_DIR/browser/images_uitest.cc',
+    '$CHROME_DIR/browser/interstitial_page_uitest.cc',
+    '$CHROME_DIR/browser/locale_tests_uitest.cc',
+    '$CHROME_DIR/browser/login_prompt_uitest.cc',
+    '$CHROME_DIR/browser/metrics_service_uitest.cc',
+    '$CHROME_DIR/browser/printing/printing_layout_uitest.cc',
+    '$CHROME_DIR/browser/resource_dispatcher_host_uitest.cc',
+    '$CHROME_DIR/browser/sanity_uitest.cc',
+    '$CHROME_DIR/browser/session_history_uitest.cc',
+    '$CHROME_DIR/browser/session_restore_uitest.cc',
+    '$CHROME_DIR/browser/ssl_uitest.cc',
+    '$CHROME_DIR/browser/tab_restore_uitest.cc',
+    '$CHROME_DIR/browser/view_source_uitest.cc',
+    '$CHROME_DIR/common/logging_chrome_uitest.cc',
+    '$CHROME_DIR/common/net/cache_uitest.cc',
+    '$CHROME_DIR/common/pref_service_uitest.cc',
+    '$CHROME_DIR/test/accessibility/accessibility_tests.cc',
+    '$CHROME_DIR/test/accessibility/accessibility_util.cc',
+    '$CHROME_DIR/test/accessibility/browser_impl.cc',
+    '$CHROME_DIR/test/accessibility/keyboard_util.cc',
+    '$CHROME_DIR/test/accessibility/registry_util.cc',
+    '$CHROME_DIR/test/accessibility/tab_impl.cc',
+    '$CHROME_DIR/test/automation/automation_proxy_uitest.cc',
+    '$CHROME_DIR/test/perf/mem_usage.cc',
+    '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX',
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
+]
+
+if env['PLATFORM'] == 'win32':
+  ui_test_files.extend([
+      '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc',
+      '$CHROME_DIR/browser/views/find_bar_win_uitest.cc',
+  ])
+
+env.ChromeTestProgram('ui_tests',  ui_test_files)