diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 22:59:59 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 22:59:59 +0000 |
commit | e0d1613b7e8ea70c12d08d3a551a8db2942134ea (patch) | |
tree | b1578925278b91670b6c83fbf55bf2133d2e6c59 /chrome/SConscript.automated_ui_tests | |
parent | f7189d0156f542131ba619dc2493aa64c4f070d5 (diff) | |
download | chromium_src-e0d1613b7e8ea70c12d08d3a551a8db2942134ea.zip chromium_src-e0d1613b7e8ea70c12d08d3a551a8db2942134ea.tar.gz chromium_src-e0d1613b7e8ea70c12d08d3a551a8db2942134ea.tar.bz2 |
Fix line endings on a few more SConscript files.
TBR=evanm
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/SConscript.automated_ui_tests')
-rw-r--r-- | chrome/SConscript.automated_ui_tests | 218 |
1 files changed, 109 insertions, 109 deletions
diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests index 9f73ce8..75d1b70 100644 --- a/chrome/SConscript.automated_ui_tests +++ b/chrome/SConscript.automated_ui_tests @@ -1,109 +1,109 @@ -# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-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/scons/include',
- '$SKIA_DIR/include',
- '$SKIA_DIR/include/corecg',
- '$SKIA_DIR/platform',
- '#/..',
- '$GTEST_DIR/include',
- 'third_party/wtl/include',
- 'tools/build/win',
- ],
- CPPDEFINES = [
- 'LIBXML_STATIC',
- ],
- LIBS = [
- 'libxml',
- 'googleurl',
- 'skia',
- 'libpng',
- 'gtest',
- 'base_gfx',
- 'icuuc',
- 'zlib',
- 'base',
- ],
-)
-
-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 = [
- 'comsupp.lib',
- 'oleacc.lib',
- 'psapi.lib',
- 'rpcrt4.lib',
- ],
-)
-
-libs = [
- 'common/common.lib',
- 'browser/browser.lib',
- 'browser/views/browser_views.lib',
- 'test/automation/automation.lib',
-]
-
-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 + libs)
-
-i = env_test.Install('$TARGET_ROOT', exe)
-Alias('chrome', i)
+# Copyright 2008, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +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/scons/include', + '$SKIA_DIR/include', + '$SKIA_DIR/include/corecg', + '$SKIA_DIR/platform', + '#/..', + '$GTEST_DIR/include', + 'third_party/wtl/include', + 'tools/build/win', + ], + CPPDEFINES = [ + 'LIBXML_STATIC', + ], + LIBS = [ + 'libxml', + 'googleurl', + 'skia', + 'libpng', + 'gtest', + 'base_gfx', + 'icuuc', + 'zlib', + 'base', + ], +) + +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 = [ + 'comsupp.lib', + 'oleacc.lib', + 'psapi.lib', + 'rpcrt4.lib', + ], +) + +libs = [ + 'common/common.lib', + 'browser/browser.lib', + 'browser/views/browser_views.lib', + 'test/automation/automation.lib', +] + +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 + libs) + +i = env_test.Install('$TARGET_ROOT', exe) +Alias('chrome', i) |