diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-23 04:45:40 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-23 04:45:40 +0000 |
| commit | 229c8b007d554b627874704b3aa154745e79d4cb (patch) | |
| tree | 112e2a0543f9845c69f6359e32f5780bf3ff4843 /testing | |
| parent | d06d9474d6e76ecc124f0e1063fdcbabd48d7844 (diff) | |
| download | chromium_src-229c8b007d554b627874704b3aa154745e79d4cb.zip chromium_src-229c8b007d554b627874704b3aa154745e79d4cb.tar.gz chromium_src-229c8b007d554b627874704b3aa154745e79d4cb.tar.bz2 | |
Set svn:eol-style so patches will apply on all platforms.
TBR: dglazkov
Review URL: http://codereview.chromium.org/16231
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/SConscript.gtest | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/testing/SConscript.gtest b/testing/SConscript.gtest index b8b3799..c54b4c4 100644 --- a/testing/SConscript.gtest +++ b/testing/SConscript.gtest @@ -1,37 +1,37 @@ -# 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.Bit('windows'):
- 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',
- 'multiprocess_func_list.cc',
-]
-
-env.ChromeStaticLibrary('gtest', input_files)
-
-env.ChromeMSVSProject('$TESTING_DIR/gtest.vcproj',
- guid='{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}')
+# 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.Bit('windows'): + 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', + 'multiprocess_func_list.cc', +] + +env.ChromeStaticLibrary('gtest', input_files) + +env.ChromeMSVSProject('$TESTING_DIR/gtest.vcproj', + guid='{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}') |