diff options
author | Steven Knight <knight@baldmt.com> | 2009-02-22 02:03:06 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2009-02-22 02:03:06 (GMT) |
commit | 14a6ed9cc2921f8373d29964cc77d1fbde5ab745 (patch) | |
tree | 4f401bfebfe6275923e9ea85919e9297a88133ef /test/MSVC | |
parent | ad33f37453278d5dbf0d6bcea0494ff9b140dd03 (diff) | |
download | SCons-14a6ed9cc2921f8373d29964cc77d1fbde5ab745.zip SCons-14a6ed9cc2921f8373d29964cc77d1fbde5ab745.tar.gz SCons-14a6ed9cc2921f8373d29964cc77d1fbde5ab745.tar.bz2 |
Fix line endings.
Diffstat (limited to 'test/MSVC')
-rw-r--r-- | test/MSVC/hierarchical.py | 186 | ||||
-rw-r--r-- | test/MSVC/multiple-pdb.py | 166 | ||||
-rw-r--r-- | test/MSVC/pdb-VariantDir-path.py | 152 |
3 files changed, 252 insertions, 252 deletions
diff --git a/test/MSVC/hierarchical.py b/test/MSVC/hierarchical.py index cfc61cd..6b4f007 100644 --- a/test/MSVC/hierarchical.py +++ b/test/MSVC/hierarchical.py @@ -1,96 +1,96 @@ -#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-"""
-Verify use of Visual Studio with a hierarchical build.
-"""
-
-import sys
-
-import TestSCons
-
-test = TestSCons.TestSCons(match = TestSCons.match_re)
-
-if sys.platform != 'win32':
- msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
- test.skip_test(msg)
-
-
-
-test.subdir('src', 'build', 'out')
-
-test.write('SConstruct', """
-VariantDir('build', 'src', duplicate=0)
-SConscript('build/SConscript')
-""")
-
-test.write('src/SConscript',"""
-import os
-env = Environment()
-env.Append(CPPPATH=os.environ.get('INCLUDE', ''),
- LIBPATH=os.environ.get('LIB', ''))
-env['PCH'] = 'StdAfx.pch'
-env['PDB'] = '#out/test.pdb'
-env['PCHSTOP'] = 'StdAfx.h'
-env.PCH('StdAfx.cpp')
-env.Program('#out/test.exe', 'test.cpp')
-""")
-
-test.write('src/test.cpp', '''
-#include "StdAfx.h"
-
-int main(void)
-{
- return 1;
-}
-''')
-
-test.write('src/StdAfx.h', '''
-#include <windows.h>
-''')
-
-test.write('src/StdAfx.cpp', '''
-#include "StdAfx.h"
-''')
-
-test.run(arguments='out', stderr=None)
-
-test.must_exist(test.workpath('out/test.pdb'))
-test.must_exist(test.workpath('build/StdAfx.pch'))
-test.must_exist(test.workpath('build/StdAfx.obj'))
-
-test.run(arguments='-c out')
-
-test.must_not_exist(test.workpath('out/test.pdb'))
-test.must_not_exist(test.workpath('build/StdAfx.pch'))
-test.must_not_exist(test.workpath('build/StdAfx.obj'))
-
-
-
-test.pass_test()
+#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Verify use of Visual Studio with a hierarchical build. +""" + +import sys + +import TestSCons + +test = TestSCons.TestSCons(match = TestSCons.match_re) + +if sys.platform != 'win32': + msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + + + +test.subdir('src', 'build', 'out') + +test.write('SConstruct', """ +VariantDir('build', 'src', duplicate=0) +SConscript('build/SConscript') +""") + +test.write('src/SConscript',""" +import os +env = Environment() +env.Append(CPPPATH=os.environ.get('INCLUDE', ''), + LIBPATH=os.environ.get('LIB', '')) +env['PCH'] = 'StdAfx.pch' +env['PDB'] = '#out/test.pdb' +env['PCHSTOP'] = 'StdAfx.h' +env.PCH('StdAfx.cpp') +env.Program('#out/test.exe', 'test.cpp') +""") + +test.write('src/test.cpp', ''' +#include "StdAfx.h" + +int main(void) +{ + return 1; +} +''') + +test.write('src/StdAfx.h', ''' +#include <windows.h> +''') + +test.write('src/StdAfx.cpp', ''' +#include "StdAfx.h" +''') + +test.run(arguments='out', stderr=None) + +test.must_exist(test.workpath('out/test.pdb')) +test.must_exist(test.workpath('build/StdAfx.pch')) +test.must_exist(test.workpath('build/StdAfx.obj')) + +test.run(arguments='-c out') + +test.must_not_exist(test.workpath('out/test.pdb')) +test.must_not_exist(test.workpath('build/StdAfx.pch')) +test.must_not_exist(test.workpath('build/StdAfx.obj')) + + + +test.pass_test() # Local Variables: # tab-width:4 diff --git a/test/MSVC/multiple-pdb.py b/test/MSVC/multiple-pdb.py index 053fd5a..0e8caa3 100644 --- a/test/MSVC/multiple-pdb.py +++ b/test/MSVC/multiple-pdb.py @@ -1,86 +1,86 @@ -#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-"""
-Verify that setting $PDB to '${TARGET}.pdb allows us to build multiple
-programs with separate .pdb files from the same environment.
-
-Under the covers, this verifies that emitters support expansion of the
-$TARGET variable (and implicitly $SOURCE), using the original specified
-list(s).
-"""
-
-import sys
-
-import TestSCons
-
-_exe = TestSCons._exe
-
-test = TestSCons.TestSCons()
-
-if sys.platform != 'win32':
- msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
- test.skip_test(msg)
-
-test.write('SConstruct', """\
-env = Environment(PDB = '${TARGET.base}.pdb')
-env.Program('test1.cpp')
-env.Program('test2.cpp')
-""")
-
-test.write('test1.cpp', """\
-#include <stdio.h>
-#include <stdlib.h>
-int
-main(int argc, char *argv)
-{
- printf("test1.cpp\\n");
- exit (0);
-}
-""")
-
-test.write('test2.cpp', """\
-#include <stdio.h>
-#include <stdlib.h>
-int
-main(int argc, char *argv)
-{
- printf("test2.cpp\\n");
- exit (0);
-}
-""")
-
-test.run(arguments = '.')
-
-test.must_exist('test1%s' % _exe)
-test.must_exist('test1.pdb')
-test.must_exist('test2%s' % _exe)
-test.must_exist('test2.pdb')
-
-test.pass_test()
+#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Verify that setting $PDB to '${TARGET}.pdb allows us to build multiple +programs with separate .pdb files from the same environment. + +Under the covers, this verifies that emitters support expansion of the +$TARGET variable (and implicitly $SOURCE), using the original specified +list(s). +""" + +import sys + +import TestSCons + +_exe = TestSCons._exe + +test = TestSCons.TestSCons() + +if sys.platform != 'win32': + msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + +test.write('SConstruct', """\ +env = Environment(PDB = '${TARGET.base}.pdb') +env.Program('test1.cpp') +env.Program('test2.cpp') +""") + +test.write('test1.cpp', """\ +#include <stdio.h> +#include <stdlib.h> +int +main(int argc, char *argv) +{ + printf("test1.cpp\\n"); + exit (0); +} +""") + +test.write('test2.cpp', """\ +#include <stdio.h> +#include <stdlib.h> +int +main(int argc, char *argv) +{ + printf("test2.cpp\\n"); + exit (0); +} +""") + +test.run(arguments = '.') + +test.must_exist('test1%s' % _exe) +test.must_exist('test1.pdb') +test.must_exist('test2%s' % _exe) +test.must_exist('test2.pdb') + +test.pass_test() # Local Variables: # tab-width:4 diff --git a/test/MSVC/pdb-VariantDir-path.py b/test/MSVC/pdb-VariantDir-path.py index 1ecb9a3..796c36e 100644 --- a/test/MSVC/pdb-VariantDir-path.py +++ b/test/MSVC/pdb-VariantDir-path.py @@ -1,79 +1,79 @@ -#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-"""
-Verify that .pdb files get put in a variant_dir correctly.
-"""
-
-import sys
-
-import TestSCons
-
-_exe = TestSCons._exe
-
-test = TestSCons.TestSCons()
-
-if sys.platform != 'win32':
- msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
- test.skip_test(msg)
-
-test.subdir('src')
-
-test.write('SConstruct', """\
-env = Environment()
-env.Append(BINDIR = '#bin')
-
-Export('env')
-SConscript('#src/SConscript', duplicate = 0, variant_dir = '#.build')
-""")
-
-test.write(['src', 'SConscript'], """\
-Import('env')
-env['PDB'] = '${TARGET}.pdb'
-p = env.Program('test.exe', 'test.cpp')
-env.Install(env['BINDIR'], p)
-""")
-
-test.write(['src', 'test.cpp'], """\
-#include <stdio.h>
-#include <stdlib.h>
-int
-main(int argc, char *argv)
-{
- printf("test.cpp\\n");
- exit (0);
-}
-""")
-
-test.run(arguments = '.')
-
-test.must_exist(['.build', 'test%s' % _exe])
-test.must_exist(['.build', 'test%s.pdb' % _exe])
-
-test.pass_test()
+#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Verify that .pdb files get put in a variant_dir correctly. +""" + +import sys + +import TestSCons + +_exe = TestSCons._exe + +test = TestSCons.TestSCons() + +if sys.platform != 'win32': + msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + +test.subdir('src') + +test.write('SConstruct', """\ +env = Environment() +env.Append(BINDIR = '#bin') + +Export('env') +SConscript('#src/SConscript', duplicate = 0, variant_dir = '#.build') +""") + +test.write(['src', 'SConscript'], """\ +Import('env') +env['PDB'] = '${TARGET}.pdb' +p = env.Program('test.exe', 'test.cpp') +env.Install(env['BINDIR'], p) +""") + +test.write(['src', 'test.cpp'], """\ +#include <stdio.h> +#include <stdlib.h> +int +main(int argc, char *argv) +{ + printf("test.cpp\\n"); + exit (0); +} +""") + +test.run(arguments = '.') + +test.must_exist(['.build', 'test%s' % _exe]) +test.must_exist(['.build', 'test%s.pdb' % _exe]) + +test.pass_test() # Local Variables: # tab-width:4 |