From 14a6ed9cc2921f8373d29964cc77d1fbde5ab745 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Sun, 22 Feb 2009 02:03:06 +0000 Subject: Fix line endings. --- test/Decider/unknown.py | 92 ++++++++-------- test/MSVC/hierarchical.py | 186 ++++++++++++++++---------------- test/MSVC/multiple-pdb.py | 166 ++++++++++++++-------------- test/MSVC/pdb-VariantDir-path.py | 152 +++++++++++++------------- test/MSVS/vs-8.0Exp-exec.py | 218 ++++++++++++++++++------------------- test/MSVS/vs-9.0-exec.py | 226 +++++++++++++++++++-------------------- test/MSVS/vs-9.0Exp-exec.py | 226 +++++++++++++++++++-------------------- 7 files changed, 633 insertions(+), 633 deletions(-) diff --git a/test/Decider/unknown.py b/test/Decider/unknown.py index a1ae825..ec24eff 100644 --- a/test/Decider/unknown.py +++ b/test/Decider/unknown.py @@ -1,49 +1,49 @@ -#!/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 the error when the Decider() function is handed an unknown -function string. -""" - -import TestSCons - -test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) - -test.write('SConstruct', """\ -Decider('fiddle-dee-dee') -""") - -expect = r""" -scons: \*\*\* Unknown Decider value 'fiddle-dee-dee' -""" + TestSCons.file_expr - -test.run(arguments = '.', status = 2, stderr = expect) - -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 the error when the Decider() function is handed an unknown +function string. +""" + +import TestSCons + +test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) + +test.write('SConstruct', """\ +Decider('fiddle-dee-dee') +""") + +expect = r""" +scons: \*\*\* Unknown Decider value 'fiddle-dee-dee' +""" + TestSCons.file_expr + +test.run(arguments = '.', status = 2, stderr = expect) + +test.pass_test() # Local Variables: # tab-width:4 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 -''') - -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 +''') + +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 -#include -int -main(int argc, char *argv) -{ - printf("test1.cpp\\n"); - exit (0); -} -""") - -test.write('test2.cpp', """\ -#include -#include -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 +#include +int +main(int argc, char *argv) +{ + printf("test1.cpp\\n"); + exit (0); +} +""") + +test.write('test2.cpp', """\ +#include +#include +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 -#include -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 +#include +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 diff --git a/test/MSVS/vs-8.0Exp-exec.py b/test/MSVS/vs-8.0Exp-exec.py index c7ceb5a..5132d6d 100644 --- a/test/MSVS/vs-8.0Exp-exec.py +++ b/test/MSVS/vs-8.0Exp-exec.py @@ -1,109 +1,109 @@ -#!/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__" - -""" -Test that we can actually build a simple program using our generated -Visual Studio 8.0 project (.vcproj) and solution (.sln) files -using Visual C++ 8.0 Express edition. -""" - -import os -import sys - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -if sys.platform != 'win32': - msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform - test.skip_test(msg) - -msvs_version = '8.0Exp' - -if not msvs_version in test.msvs_versions(): - msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version - test.skip_test(msg) - - - -# Let SCons figure out the Visual Studio environment variables for us and -# print out a statement that we can exec to suck them into our external -# environment so we can execute devenv and really try to build something. - -test.run(arguments = '-n -q -Q -f -', stdin = """\ -env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) -""" % locals()) - -exec(test.stdout()) - - - -test.subdir('sub dir') - -test.write(['sub dir', 'SConstruct'], """\ -env=Environment(MSVS_VERSION = '%(msvs_version)s') - -env.MSVSProject(target = 'foo.vcproj', - srcs = ['foo.c'], - buildtarget = 'foo.exe', - variant = 'Release') - -env.Program('foo.c') -""" % locals()) - -test.write(['sub dir', 'foo.c'], r""" -int -main(int argc, char *argv) -{ - printf("foo.c\n"); - exit (0); -} -""") - -test.run(chdir='sub dir', arguments='.') - -test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj')) - -import SCons.Platform.win32 -system_dll_path = os.path.join( SCons.Platform.win32.get_system_root(), 'System32' ) -os.environ['PATH'] = os.environ['PATH'] + os.pathsep + system_dll_path - -test.run(chdir='sub dir', - program=[test.get_msvs_executable(msvs_version)], - arguments=['foo.sln', '/build', 'Release']) - -test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n") - - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: +#!/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__" + +""" +Test that we can actually build a simple program using our generated +Visual Studio 8.0 project (.vcproj) and solution (.sln) files +using Visual C++ 8.0 Express edition. +""" + +import os +import sys + +import TestSConsMSVS + +test = TestSConsMSVS.TestSConsMSVS() + +if sys.platform != 'win32': + msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + +msvs_version = '8.0Exp' + +if not msvs_version in test.msvs_versions(): + msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version + test.skip_test(msg) + + + +# Let SCons figure out the Visual Studio environment variables for us and +# print out a statement that we can exec to suck them into our external +# environment so we can execute devenv and really try to build something. + +test.run(arguments = '-n -q -Q -f -', stdin = """\ +env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') +print "os.environ.update(%%s)" %% repr(env['ENV']) +""" % locals()) + +exec(test.stdout()) + + + +test.subdir('sub dir') + +test.write(['sub dir', 'SConstruct'], """\ +env=Environment(MSVS_VERSION = '%(msvs_version)s') + +env.MSVSProject(target = 'foo.vcproj', + srcs = ['foo.c'], + buildtarget = 'foo.exe', + variant = 'Release') + +env.Program('foo.c') +""" % locals()) + +test.write(['sub dir', 'foo.c'], r""" +int +main(int argc, char *argv) +{ + printf("foo.c\n"); + exit (0); +} +""") + +test.run(chdir='sub dir', arguments='.') + +test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj')) + +import SCons.Platform.win32 +system_dll_path = os.path.join( SCons.Platform.win32.get_system_root(), 'System32' ) +os.environ['PATH'] = os.environ['PATH'] + os.pathsep + system_dll_path + +test.run(chdir='sub dir', + program=[test.get_msvs_executable(msvs_version)], + arguments=['foo.sln', '/build', 'Release']) + +test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n") + + + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/MSVS/vs-9.0-exec.py b/test/MSVS/vs-9.0-exec.py index be96885..0e50de4 100644 --- a/test/MSVS/vs-9.0-exec.py +++ b/test/MSVS/vs-9.0-exec.py @@ -1,113 +1,113 @@ -#!/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__" - -""" -Test that we can actually build a simple program using our generated -Visual Studio 9.0 project (.vcproj) and solution (.sln) files -using Visual Studio 9.0 (Professional edition). -""" - -import os -import sys - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -if sys.platform != 'win32': - msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform - test.skip_test(msg) - -msvs_version = '9.0' - -# TODO: remove when we add support -msg = "Generating Visual Studio %s project files is not supported yet; skipping test.\n" -test.skip_test(msg % msvs_version) - -if not msvs_version in test.msvs_versions(): - msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version - test.skip_test(msg) - - - -# Let SCons figure out the Visual Studio environment variables for us and -# print out a statement that we can exec to suck them into our external -# environment so we can execute devenv and really try to build something. - -test.run(arguments = '-n -q -Q -f -', stdin = """\ -env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) -""" % locals()) - -exec(test.stdout()) - - - -test.subdir('sub dir') - -test.write(['sub dir', 'SConstruct'], """\ -env=Environment(MSVS_VERSION = '%(msvs_version)s') - -env.MSVSProject(target = 'foo.vcproj', - srcs = ['foo.c'], - buildtarget = 'foo.exe', - variant = 'Release') - -env.Program('foo.c') -""" % locals()) - -test.write(['sub dir', 'foo.c'], r""" -int -main(int argc, char *argv) -{ - printf("foo.c\n"); - exit (0); -} -""") - -test.run(chdir='sub dir', arguments='.') - -test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj')) - -import SCons.Platform.win32 -system_dll_path = os.path.join( SCons.Platform.win32.get_system_root(), 'System32' ) -os.environ['PATH'] = os.environ['PATH'] + os.pathsep + system_dll_path - -test.run(chdir='sub dir', - program=[test.get_msvs_executable(msvs_version)], - arguments=['foo.sln', '/build', 'Release']) - -test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n") - - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: +#!/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__" + +""" +Test that we can actually build a simple program using our generated +Visual Studio 9.0 project (.vcproj) and solution (.sln) files +using Visual Studio 9.0 (Professional edition). +""" + +import os +import sys + +import TestSConsMSVS + +test = TestSConsMSVS.TestSConsMSVS() + +if sys.platform != 'win32': + msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + +msvs_version = '9.0' + +# TODO: remove when we add support +msg = "Generating Visual Studio %s project files is not supported yet; skipping test.\n" +test.skip_test(msg % msvs_version) + +if not msvs_version in test.msvs_versions(): + msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version + test.skip_test(msg) + + + +# Let SCons figure out the Visual Studio environment variables for us and +# print out a statement that we can exec to suck them into our external +# environment so we can execute devenv and really try to build something. + +test.run(arguments = '-n -q -Q -f -', stdin = """\ +env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') +print "os.environ.update(%%s)" %% repr(env['ENV']) +""" % locals()) + +exec(test.stdout()) + + + +test.subdir('sub dir') + +test.write(['sub dir', 'SConstruct'], """\ +env=Environment(MSVS_VERSION = '%(msvs_version)s') + +env.MSVSProject(target = 'foo.vcproj', + srcs = ['foo.c'], + buildtarget = 'foo.exe', + variant = 'Release') + +env.Program('foo.c') +""" % locals()) + +test.write(['sub dir', 'foo.c'], r""" +int +main(int argc, char *argv) +{ + printf("foo.c\n"); + exit (0); +} +""") + +test.run(chdir='sub dir', arguments='.') + +test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj')) + +import SCons.Platform.win32 +system_dll_path = os.path.join( SCons.Platform.win32.get_system_root(), 'System32' ) +os.environ['PATH'] = os.environ['PATH'] + os.pathsep + system_dll_path + +test.run(chdir='sub dir', + program=[test.get_msvs_executable(msvs_version)], + arguments=['foo.sln', '/build', 'Release']) + +test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n") + + + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/MSVS/vs-9.0Exp-exec.py b/test/MSVS/vs-9.0Exp-exec.py index eb8e32d..7c04cda 100644 --- a/test/MSVS/vs-9.0Exp-exec.py +++ b/test/MSVS/vs-9.0Exp-exec.py @@ -1,113 +1,113 @@ -#!/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__" - -""" -Test that we can actually build a simple program using our generated -Visual Studio 9.0 project (.vcproj) and solution (.sln) files -using Visual C++ 9.0 Express edition. -""" - -import os -import sys - -import TestSConsMSVS - -test = TestSConsMSVS.TestSConsMSVS() - -if sys.platform != 'win32': - msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform - test.skip_test(msg) - -msvs_version = '9.0Exp' - -# TODO: remove when we add support -msg = "Generating Visual Studio %s project files is not supported yet; skipping test.\n" -test.skip_test(msg % msvs_version) - -if not msvs_version in test.msvs_versions(): - msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version - test.skip_test(msg) - - - -# Let SCons figure out the Visual Studio environment variables for us and -# print out a statement that we can exec to suck them into our external -# environment so we can execute devenv and really try to build something. - -test.run(arguments = '-n -q -Q -f -', stdin = """\ -env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) -""" % locals()) - -exec(test.stdout()) - - - -test.subdir('sub dir') - -test.write(['sub dir', 'SConstruct'], """\ -env=Environment(MSVS_VERSION = '%(msvs_version)s') - -env.MSVSProject(target = 'foo.vcproj', - srcs = ['foo.c'], - buildtarget = 'foo.exe', - variant = 'Release') - -env.Program('foo.c') -""" % locals()) - -test.write(['sub dir', 'foo.c'], r""" -int -main(int argc, char *argv) -{ - printf("foo.c\n"); - exit (0); -} -""") - -test.run(chdir='sub dir', arguments='.') - -test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj')) - -import SCons.Platform.win32 -system_dll_path = os.path.join( SCons.Platform.win32.get_system_root(), 'System32' ) -os.environ['PATH'] = os.environ['PATH'] + os.pathsep + system_dll_path - -test.run(chdir='sub dir', - program=[test.get_msvs_executable(msvs_version)], - arguments=['foo.sln', '/build', 'Release']) - -test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n") - - - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: +#!/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__" + +""" +Test that we can actually build a simple program using our generated +Visual Studio 9.0 project (.vcproj) and solution (.sln) files +using Visual C++ 9.0 Express edition. +""" + +import os +import sys + +import TestSConsMSVS + +test = TestSConsMSVS.TestSConsMSVS() + +if sys.platform != 'win32': + msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + +msvs_version = '9.0Exp' + +# TODO: remove when we add support +msg = "Generating Visual Studio %s project files is not supported yet; skipping test.\n" +test.skip_test(msg % msvs_version) + +if not msvs_version in test.msvs_versions(): + msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version + test.skip_test(msg) + + + +# Let SCons figure out the Visual Studio environment variables for us and +# print out a statement that we can exec to suck them into our external +# environment so we can execute devenv and really try to build something. + +test.run(arguments = '-n -q -Q -f -', stdin = """\ +env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') +print "os.environ.update(%%s)" %% repr(env['ENV']) +""" % locals()) + +exec(test.stdout()) + + + +test.subdir('sub dir') + +test.write(['sub dir', 'SConstruct'], """\ +env=Environment(MSVS_VERSION = '%(msvs_version)s') + +env.MSVSProject(target = 'foo.vcproj', + srcs = ['foo.c'], + buildtarget = 'foo.exe', + variant = 'Release') + +env.Program('foo.c') +""" % locals()) + +test.write(['sub dir', 'foo.c'], r""" +int +main(int argc, char *argv) +{ + printf("foo.c\n"); + exit (0); +} +""") + +test.run(chdir='sub dir', arguments='.') + +test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj')) + +import SCons.Platform.win32 +system_dll_path = os.path.join( SCons.Platform.win32.get_system_root(), 'System32' ) +os.environ['PATH'] = os.environ['PATH'] + os.pathsep + system_dll_path + +test.run(chdir='sub dir', + program=[test.get_msvs_executable(msvs_version)], + arguments=['foo.sln', '/build', 'Release']) + +test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n") + + + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: -- cgit v0.12