diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-25 22:08:44 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-25 22:08:44 +0000 |
| commit | de8d2667d6953abb31b7c5385ca718ad47adf6a1 (patch) | |
| tree | 3d4499631bbf551dd81bb50b43452705b37d7bfb /testing | |
| parent | c9ec45429c64884c35f83b74131c0e3ae5b2bbe9 (diff) | |
| download | chromium_src-de8d2667d6953abb31b7c5385ca718ad47adf6a1.zip chromium_src-de8d2667d6953abb31b7c5385ca718ad47adf6a1.tar.gz chromium_src-de8d2667d6953abb31b7c5385ca718ad47adf6a1.tar.bz2 | |
Wow, it's been a while since we cleaned EOL.
Ran dos2unix on *.cc, *.h, *.py and SCons*.*
Ran for /R /D %a in (*.*) do @if exist %a\.svn\. svn pset svn:eol-style LF %a\*.cc
Ran for /R /D %a in (*.*) do @if exist %a\.svn\. svn pset svn:eol-style LF %a\*.h
Ran for /R /D %a in (*.*) do @if exist %a\.svn\. svn pset svn:eol-style LF %a\*.py
Ran for /R /D %a in (*.*) do @if exist %a\.svn\. svn pset svn:eol-style LF %a\SCons*.*
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/SConscript.gtest | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/testing/SConscript.gtest b/testing/SConscript.gtest index dc8a688..4f6bbf0 100644 --- a/testing/SConscript.gtest +++ b/testing/SConscript.gtest @@ -1,34 +1,34 @@ -# 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.Prepend(
- CPPPATH = [
- '$GTEST_DIR',
- '$GTEST_DIR/include',
- ],
-)
-
-if env['PLATFORM'] == 'win32':
- env.Append(
- CCFLAGS = [
- '/TP',
-
- '/WX',
- '/Wp64',
- ],
- )
-
-input_files = [
- 'gtest/src/gtest-death-test.cc',
- 'gtest/src/gtest-filepath.cc',
- 'gtest/src/gtest-port.cc',
- 'gtest/src/gtest.cc',
-]
-
-env.ChromeStaticLibrary('gtest', input_files)
-
+# 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.Prepend( + CPPPATH = [ + '$GTEST_DIR', + '$GTEST_DIR/include', + ], +) + +if env['PLATFORM'] == 'win32': + env.Append( + CCFLAGS = [ + '/TP', + + '/WX', + '/Wp64', + ], + ) + +input_files = [ + 'gtest/src/gtest-death-test.cc', + 'gtest/src/gtest-filepath.cc', + 'gtest/src/gtest-port.cc', + 'gtest/src/gtest.cc', +] + +env.ChromeStaticLibrary('gtest', input_files) + |