From 401ef15c42e9df4f60103dc52b806b3c8ab259fb Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Thu, 6 Oct 2005 17:15:02 +0000 Subject: Refactor MSVS tests to separate file-generation tests (which can be executed on any Windows system) from Visual Studio execution tests (which need a specific VS version installed). --- etc/TestSCons.py | 20 +++- test/MSVS/vs-6.0-exec.py | 91 +++++++++++++++ test/MSVS/vs-6.0-files.py | 236 ++++++++++++++++++++++++++++++++++++++ test/MSVS/vs-6.0.py | 285 ---------------------------------------------- test/MSVS/vs-7.0-exec.py | 93 +++++++++++++++ test/MSVS/vs-7.0-files.py | 212 ++++++++++++++++++++++++++++++++++ test/MSVS/vs-7.0.py | 259 ----------------------------------------- test/MSVS/vs-7.1-exec.py | 93 +++++++++++++++ test/MSVS/vs-7.1-files.py | 215 ++++++++++++++++++++++++++++++++++ test/MSVS/vs-7.1.py | 270 ------------------------------------------- 10 files changed, 956 insertions(+), 818 deletions(-) create mode 100644 test/MSVS/vs-6.0-exec.py create mode 100644 test/MSVS/vs-6.0-files.py delete mode 100644 test/MSVS/vs-6.0.py create mode 100644 test/MSVS/vs-7.0-exec.py create mode 100644 test/MSVS/vs-7.0-files.py delete mode 100644 test/MSVS/vs-7.0.py create mode 100644 test/MSVS/vs-7.1-exec.py create mode 100644 test/MSVS/vs-7.1-files.py delete mode 100644 test/MSVS/vs-7.1.py diff --git a/etc/TestSCons.py b/etc/TestSCons.py index 649cf8e..e0fd12f 100644 --- a/etc/TestSCons.py +++ b/etc/TestSCons.py @@ -274,6 +274,16 @@ class TestSCons(TestCommon): # we call test.no_result(). self.no_result(skip=1) + def diff_substr(self, expect, actual): + i = 0 + for x, y in zip(expect, actual): + if x != y: + return "Actual did not match expect at char %d:\n" \ + " Expect: %s\n" \ + " Actual: %s\n" \ + % (i, repr(expect[i-20:i+40]), repr(actual[i-20:i+40])) + i = i + 1 + return "Actual matched the expected output???" def java_ENV(self): """ @@ -463,17 +473,19 @@ print "self._msvs_versions =", str(env['MSVS']['VERSIONS']) contents = string.replace(contents, orig, replace) self.write(fname, contents) - def msvs_substitute(self, input, msvs_ver, python=sys.executable): + def msvs_substitute(self, input, msvs_ver, subdir=None, python=sys.executable): if not hasattr(self, '_msvs_versions'): self.msvs_versions() - if msvs_ver in ['7.1']: - python = '"' + python + '"' + if subdir: + workpath = self.workpath(subdir) + else: + workpath = self.workpath() exec_script_main = "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-%s'), join(sys.prefix, 'scons-%s'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons') ] + sys.path; import SCons.Script; SCons.Script.main()" % (self._scons_version, self._scons_version) exec_script_main_xml = string.replace(exec_script_main, "'", "'") - result = string.replace(input, r'', self.workpath()) + result = string.replace(input, r'', workpath) result = string.replace(result, r'', python) result = string.replace(result, r'', exec_script_main) result = string.replace(result, r'', exec_script_main_xml) diff --git a/test/MSVS/vs-6.0-exec.py b/test/MSVS/vs-6.0-exec.py new file mode 100644 index 0000000..8f15bdc --- /dev/null +++ b/test/MSVS/vs-6.0-exec.py @@ -0,0 +1,91 @@ +#!/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 6 project (.dsp) and solution (.dsw) files. +""" + +import os +import sys + +import TestSCons + +test = TestSCons.TestSCons() + +if sys.platform != 'win32': + msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + +if not '6.0' in test.msvs_versions(): + msg = "Visual Studio 6 not installed; skipping test.\n" + 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 msdev and really try to build something. + +test.run(arguments = '-n -q -Q -f -', stdin = """\ +env = Environment(tools = ['msvc']) +print "os.environ.update(%s)" % repr(env['ENV']) +""") + +exec(test.stdout()) + + + +test.write('SConstruct', """\ +env=Environment(MSVS_VERSION = '6.0') + +env.MSVSProject(target = 'foo.dsp', + srcs = ['foo.c'], + buildtarget = 'foo.exe', + variant = 'Release') + +env.Program('foo.c') +""") + +test.write('foo.c', r""" +int +main(int argc, char *argv) +{ + printf("foo.c\n"); + exit (0); +} +""") + +test.run(arguments='.') + +test.run(program=['msdev'], + arguments=['Test.dsp', '/MAKE', 'foo - Win32 Release']) + +test.run(program=test.workpath('foo'), stdout="foo.c\n") + + + +test.pass_test() diff --git a/test/MSVS/vs-6.0-files.py b/test/MSVS/vs-6.0-files.py new file mode 100644 index 0000000..fdc8ef2 --- /dev/null +++ b/test/MSVS/vs-6.0-files.py @@ -0,0 +1,236 @@ +#!/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 generate Visual Studio 6 project (.dsp) and solution +(.dsw) files that look correct. +""" + +import os +import sys + +import TestCmd +import TestSCons + +test = TestSCons.TestSCons(match = TestCmd.match_re) + +if sys.platform != 'win32': + msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + + + +expected_dspfile = '''\ +# Microsoft Developer Studio Project File - Name="Test" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=Test - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "Test.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "Test.mak" CFG="Test - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Test - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" + +!IF "$(CFG)" == "Test - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "" +# PROP BASE Intermediate_Dir "" +# PROP BASE Cmd_Line "echo Starting SCons && "" -c "" -C -f SConstruct \Test.exe" +# PROP BASE Rebuild_Opt "-c && echo Starting SCons && "" -c "" -C -f SConstruct \Test.exe" +# PROP BASE Target_File "\Test.exe" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "" +# PROP Intermediate_Dir "" +# PROP Cmd_Line "echo Starting SCons && "" -c "" -C -f SConstruct \Test.exe" +# PROP Rebuild_Opt "-c && echo Starting SCons && "" -c "" -C -f SConstruct \Test.exe" +# PROP Target_File "\Test.exe" +# PROP Bsc_Name "" +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "Test - Win32 Release" + +!IF "$(CFG)" == "Test - Win32 Release" + +!ENDIF + +# Begin Group " Source Files" + +# PROP Default_Filter "cpp;c;cxx;l;y;def;odl;idl;hpj;bat" +# Begin Source File + +SOURCE="test.c" +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE="sdk.h" +# End Source File +# End Group +# Begin Group "Local Headers" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE="test.h" +# End Source File +# End Group +# Begin Group "Other Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE="readme.txt" +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "r;rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE="test.rc" +# End Source File +# End Group +# Begin Source File + +SOURCE="\SConstruct" +# End Source File +# End Target +# End Project +''' + +expected_dswfile = '''\ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "Test"="\Test.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### +''' + + +test.subdir('work1') + +test.write(['work1', 'SConstruct'], """\ +env=Environment(MSVS_VERSION = '6.0') + +testsrc = ['test.c'] +testincs = ['sdk.h'] +testlocalincs = ['test.h'] +testresources = ['test.rc'] +testmisc = ['readme.txt'] + +env.MSVSProject(target = 'Test.dsp', + srcs = testsrc, + incs = testincs, + localincs = testlocalincs, + resources = testresources, + misc = testmisc, + buildtarget = 'Test.exe', + variant = 'Release') +""") + +test.run(chdir='work1', arguments="Test.dsp") + +test.must_exist(test.workpath('work1', 'Test.dsp')) +dsp = test.read(['work1', 'Test.dsp'], 'r') +expect = test.msvs_substitute(expected_dspfile, '6.0', 'work1') +# don't compare the pickled data +assert dsp[:len(expect)] == expect, test.diff_substr(expect, dsp) + +test.must_exist(test.workpath('work1', 'Test.dsw')) +dsw = test.read(['work1', 'Test.dsw'], 'r') +expect = test.msvs_substitute(expected_dswfile, '6.0', 'work1') +assert dsw == expect, test.diff_substr(expect, dsw) + +test.run(chdir='work1', arguments='-c .') + +test.must_not_exist(test.workpath('work1', 'Test.dsp')) +test.must_not_exist(test.workpath('work1', 'Test.dsw')) + +test.run(chdir='work1', arguments='Test.dsp') + +test.must_exist(test.workpath('work1', 'Test.dsp')) +test.must_exist(test.workpath('work1', 'Test.dsw')) + +test.run(chdir='work1', arguments='-c Test.dsw') + +test.must_not_exist(test.workpath('work1', 'Test.dsp')) +test.must_not_exist(test.workpath('work1', 'Test.dsw')) + + + +test.pass_test() diff --git a/test/MSVS/vs-6.0.py b/test/MSVS/vs-6.0.py deleted file mode 100644 index b993aad..0000000 --- a/test/MSVS/vs-6.0.py +++ /dev/null @@ -1,285 +0,0 @@ -#!/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__" - -import os -import os.path -import string -import sys - -import TestCmd -import TestSCons - -test = TestSCons.TestSCons(match = TestCmd.match_re) - -if sys.platform != 'win32': - msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform - test.skip_test(msg) - -if not '6.0' in test.msvs_versions(): - msg = "Visual Studio 6 not installed; skipping test.\n" - test.skip_test(msg) - -def diff_section(expect, actual): - i = 0 - for x, y in zip(expect, actual): - if x != y: - return "Actual did not match expect at char %d:\n" \ - " Expect: %s\n" \ - " Actual: %s\n" \ - % (i, repr(expect[i-20:i+40]), repr(actual[i-20:i+40])) - i = i + 1 - return "Actual matched the expected output???" - -expected_dspfile = '''\ -# Microsoft Developer Studio Project File - Name="Test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=Test - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Test.mak" CFG="Test - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Test - Win32 Release" (based on "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "Test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "" -# PROP BASE Intermediate_Dir "" -# PROP BASE Cmd_Line "echo Starting SCons && "" -c "" -C -f SConstruct \Test.exe" -# PROP BASE Rebuild_Opt "-c && echo Starting SCons && "" -c "" -C -f SConstruct \Test.exe" -# PROP BASE Target_File "\Test.exe" -# PROP BASE Bsc_Name "" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "" -# PROP Intermediate_Dir "" -# PROP Cmd_Line "echo Starting SCons && "" -c "" -C -f SConstruct \Test.exe" -# PROP Rebuild_Opt "-c && echo Starting SCons && "" -c "" -C -f SConstruct \Test.exe" -# PROP Target_File "\Test.exe" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "Test - Win32 Release" - -!IF "$(CFG)" == "Test - Win32 Release" - -!ENDIF - -# Begin Group " Source Files" - -# PROP Default_Filter "cpp;c;cxx;l;y;def;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="test.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="sdk.h" -# End Source File -# End Group -# Begin Group "Local Headers" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="test.h" -# End Source File -# End Group -# Begin Group "Other Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE="readme.txt" -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "r;rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE="test.rc" -# End Source File -# End Group -# Begin Source File - -SOURCE="\SConstruct" -# End Source File -# End Target -# End Project -''' - -expected_dswfile = '''\ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Test"="\Test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### -''' - - - -test.write('SConstruct',''' -env=Environment(MSVS_VERSION = '6.0') - -testsrc = ['test.c'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.dsp', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -''') - -test.run(arguments="Test.dsp") - -test.must_exist(test.workpath('Test.dsp')) -dsp = test.read('Test.dsp', 'r') -expect = test.msvs_substitute(expected_dspfile, '6.0') -# don't compare the pickled data -assert dsp[:len(expect)] == expect, diff_section(expect, dsp) - -test.must_exist(test.workpath('Test.dsw')) -dsw = test.read('Test.dsw', 'r') -expect = test.msvs_substitute(expected_dswfile, '6.0') -assert dsw == expect, diff_section(expect, dsw) - -test.run(arguments='-c .') - -test.must_not_exist(test.workpath('Test.dsp')) -test.must_not_exist(test.workpath('Test.dsw')) - -test.run(arguments='Test.dsp') - -test.must_exist(test.workpath('Test.dsp')) -test.must_exist(test.workpath('Test.dsw')) - -test.run(arguments='-c Test.dsw') - -test.must_not_exist(test.workpath('Test.dsp')) -test.must_not_exist(test.workpath('Test.dsw')) - - - -test.write('SConstruct',''' -env=Environment(MSVS_VERSION = '6.0') - -env.MSVSProject(target = 'Test.dsp', - srcs = ['test.c'], - buildtarget = 'Test.exe', - variant = 'Release') - -env.Program('test.c') -''') - -test.write('test.c', r""" -int -main(int argc, char *argv) -{ - printf("test.c\n"); - exit (0); -} -""") - -# 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 msdev and really try to build something. - -test.run(arguments = '-n -q -Q -f -', stdin = """\ -env = Environment(tools = ['msvc']) -print "os.environ.update(%s)" % repr(env['ENV']) -""") - -exec(test.stdout()) - -test.run(arguments='Test.dsp') - -test.run(program=['msdev'], - arguments=['Test.dsp', '/MAKE', 'test - Win32 Release']) - -test.run(program=test.workpath('test'), stdout = "test.c\n") - - - -test.pass_test() diff --git a/test/MSVS/vs-7.0-exec.py b/test/MSVS/vs-7.0-exec.py new file mode 100644 index 0000000..0438434 --- /dev/null +++ b/test/MSVS/vs-7.0-exec.py @@ -0,0 +1,93 @@ +#!/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 7.0 project (.vcproj) and solution (.sln) files. +""" + +import os +import sys + +import TestSCons + +test = TestSCons.TestSCons() + +if sys.platform != 'win32': + msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + +if not '7.0' in test.msvs_versions(): + msg = "Visual Studio 7.0 not installed; skipping test.\n" + 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']) +print "os.environ.update(%s)" % repr(env['ENV']) +""") + +exec(test.stdout()) + + + +test.write('SConstruct', """\ +env=Environment(MSVS_VERSION = '7.0') + +env.MSVSProject(target = 'foo.vcproj', + srcs = ['foo.c'], + buildtarget = 'foo.exe', + variant = 'Release') + +env.Program('foo.c') +""") + +test.write('foo.c', r""" +int +main(int argc, char *argv) +{ + printf("foo.c\n"); + exit (0); +} +""") + +test.run(arguments='.') + +test.vcproj_sys_path('foo.vcproj') + +test.run(program=['devenv'], + arguments=['foo.sln', '/build', 'Release']) + +test.run(program=test.workpath('foo'), stdout="foo.c\n") + + + +test.pass_test() diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py new file mode 100644 index 0000000..c04c112 --- /dev/null +++ b/test/MSVS/vs-7.0-files.py @@ -0,0 +1,212 @@ +#!/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 generate Visual Studio 7.0 project (.vcproj) and +solution (.sln) files that look correct. +""" + +import os +import os.path +import sys + +import TestCmd +import TestSCons + +test = TestSCons.TestSCons(match = TestCmd.match_re) + +if sys.platform != 'win32': + msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + +expected_slnfile = """\ +Microsoft Visual Studio Solution File, Format Version 7.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "{SLNGUID}" +EndProject +Global +\tGlobalSection(SolutionConfiguration) = preSolution +\t\tConfigName.0 = Release +\tEndGlobalSection +\tGlobalSection(ProjectDependencies) = postSolution +\tEndGlobalSection +\tGlobalSection(ProjectConfiguration) = postSolution +\t\t{SLNGUID}.Release.ActiveCfg = Release|Win32 +\t\t{SLNGUID}.Release.Build.0 = Release|Win32 +\tEndGlobalSection +\tGlobalSection(ExtensibilityGlobals) = postSolution +\tEndGlobalSection +\tGlobalSection(ExtensibilityAddIns) = postSolution +\tEndGlobalSection +EndGlobal +""" + +expected_vcprojfile = """\ + + +\t +\t\t +\t +\t +\t\t +\t\t\t +\t\t +\t +\t +\t\t +\t\t\t +\t\t\t +\t\t +\t\t +\t\t\t +\t\t\t +\t\t +\t\t +\t\t\t +\t\t\t +\t\t +\t\t +\t\t\t +\t\t\t +\t\t +\t\t +\t\t\t +\t\t\t +\t\t +\t\t +\t\t +\t +\t +\t + +""" + + +test.subdir('work1') + +test.write(['work1', 'SConstruct'], """\ +env=Environment(MSVS_VERSION = '7.0') + +testsrc = ['test.cpp'] +testincs = ['sdk.h'] +testlocalincs = ['test.h'] +testresources = ['test.rc'] +testmisc = ['readme.txt'] + +env.MSVSProject(target = 'Test.vcproj', + slnguid = '{SLNGUID}', + srcs = testsrc, + incs = testincs, + localincs = testlocalincs, + resources = testresources, + misc = testmisc, + buildtarget = 'Test.exe', + variant = 'Release') +""") + +test.run(chdir='work1', arguments="Test.vcproj") + +test.must_exist(test.workpath('work1', 'Test.vcproj')) +vcproj = test.read(['work1', 'Test.vcproj'], 'r') +expect = test.msvs_substitute(expected_vcprojfile, '7.0', 'work1') +# don't compare the pickled data +assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + +test.must_exist(test.workpath('work1', 'Test.sln')) +sln = test.read(['work1', 'Test.sln'], 'r') +expect = test.msvs_substitute(expected_slnfile, '7.0', 'work1') +# don't compare the pickled data +assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) + +test.run(chdir='work1', arguments='-c .') + +test.must_not_exist(test.workpath('work1', 'Test.vcproj')) +test.must_not_exist(test.workpath('work1', 'Test.sln')) + +test.run(chdir='work1', arguments='Test.vcproj') + +test.must_exist(test.workpath('work1', 'Test.vcproj')) +test.must_exist(test.workpath('work1', 'Test.sln')) + +test.run(chdir='work1', arguments='-c Test.sln') + +test.must_not_exist(test.workpath('work1', 'Test.vcproj')) +test.must_not_exist(test.workpath('work1', 'Test.sln')) + + + +# Test that running SCons with $PYTHON_ROOT in the environment +# changes the .vcproj output as expected. +os.environ['PYTHON_ROOT'] = 'xyzzy' + +test.run(chdir='work1', arguments='Test.vcproj') + +python = os.path.join('$(PYTHON_ROOT)', os.path.split(sys.executable)[1]) + +test.must_exist(test.workpath('work1', 'Test.vcproj')) +vcproj = test.read(['work1', 'Test.vcproj'], 'r') +expect = test.msvs_substitute(expected_vcprojfile, '7.0', 'work1', python=python) +# don't compare the pickled data +assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + +os.environ['PYTHON_ROOT'] = '' + + + +test.pass_test() diff --git a/test/MSVS/vs-7.0.py b/test/MSVS/vs-7.0.py deleted file mode 100644 index bbc7585..0000000 --- a/test/MSVS/vs-7.0.py +++ /dev/null @@ -1,259 +0,0 @@ -#!/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__" - -import os -import os.path -import sys - -import TestCmd -import TestSCons - -test = TestSCons.TestSCons(match = TestCmd.match_re) - -if sys.platform != 'win32': - msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform - test.skip_test(msg) - -if not '7.0' in test.msvs_versions(): - msg = "Visual Studio 7.0 not installed; skipping test.\n" - test.skip_test(msg) - -def diff_section(expect, actual): - i = 0 - for x, y in zip(expect, actual): - if x != y: - return "Actual did not match expect at char %d:\n" \ - " Expect: %s\n" \ - " Actual: %s\n" \ - % (i, repr(expect[i-20:i+40]), repr(actual[i-20:i+40])) - i = i + 1 - return "Actual matched the expected output???" - -expected_slnfile = """\ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "{SLNGUID}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {SLNGUID}.Release.ActiveCfg = Release|Win32 - {SLNGUID}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal -""" - -expected_vcprojfile = """\ - - - - - - - - " -C -f SConstruct \Test.exe" - CleanCommandLine="echo Starting SCons && -c "" -C -f SConstruct -c \Test.exe" - RebuildCommandLine="echo Starting SCons && -c "" -C -f SConstruct \Test.exe" - Output="\Test.exe"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -""" - -test.write('SConstruct', """\ -env=Environment(MSVS_VERSION = '7.0') - -testsrc = ['test.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcproj', - slnguid = '{SLNGUID}', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""") - -test.run(arguments="Test.vcproj") - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '7.0') -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, diff_section(expect, vcproj) - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '7.0') -# don't compare the pickled data -assert sln[:len(expect)] == expect, diff_section(expect, sln) - -test.run(arguments='-c .') - -test.must_not_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - -test.run(arguments='Test.vcproj') - -test.must_exist(test.workpath('Test.vcproj')) -test.must_exist(test.workpath('Test.sln')) - -test.run(arguments='-c Test.sln') - -test.must_not_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - - - -# Test that running SCons with $PYTHON_ROOT in the environment -# changes the .vcproj output as expected. -os.environ['PYTHON_ROOT'] = 'xyzzy' - -test.run(arguments='Test.vcproj') - -python = os.path.join('$(PYTHON_ROOT)', os.path.split(sys.executable)[1]) - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '7.0', python=python) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, diff_section(expect, vcproj) - -os.environ['PYTHON_ROOT'] = '' - - - -test.write('SConstruct', """\ -env=Environment(MSVS_VERSION = '7.0') - -env.MSVSProject(target = 'Test.vcproj', - srcs = ['test.c'], - buildtarget = 'test.exe', - variant = 'Release') - -env.Program('test.c') -""") - -test.write('test.c', r""" -int -main(int argc, char *argv) -{ - printf("test.c\n"); - exit (0); -} -""") - -# 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']) -print "os.environ.update(%s)" % repr(env['ENV']) -""") - -exec(test.stdout()) - -test.run(arguments='Test.vcproj') - -test.run(program=['devenv'], - arguments=['Test.sln', '/build', 'Release']) - -test.run(program=test.workpath('test'), stdout = "test.c\n") - - - -test.pass_test() diff --git a/test/MSVS/vs-7.1-exec.py b/test/MSVS/vs-7.1-exec.py new file mode 100644 index 0000000..f546aa5 --- /dev/null +++ b/test/MSVS/vs-7.1-exec.py @@ -0,0 +1,93 @@ +#!/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 7.1 project (.vcproj) and solution (.sln) files. +""" + +import os +import sys + +import TestSCons + +test = TestSCons.TestSCons() + +if sys.platform != 'win32': + msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + +if not '7.1' in test.msvs_versions(): + msg = "Visual Studio 7.1 not installed; skipping test.\n" + 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']) +print "os.environ.update(%s)" % repr(env['ENV']) +""") + +exec(test.stdout()) + + + +test.write('SConstruct', """\ +env=Environment(MSVS_VERSION = '7.1') + +env.MSVSProject(target = 'foo.vcproj', + srcs = ['foo.c'], + buildtarget = 'foo.exe', + variant = 'Release') + +env.Program('foo.c') +""") + +test.write('foo.c', r""" +int +main(int argc, char *argv) +{ + printf("foo.c\n"); + exit (0); +} +""") + +test.run(arguments='.') + +test.vcproj_sys_path('foo.vcproj') + +test.run(program=['devenv'], + arguments=['foo.sln', '/build', 'Release']) + +test.run(program=test.workpath('foo'), stdout="foo.c\n") + + + +test.pass_test() diff --git a/test/MSVS/vs-7.1-files.py b/test/MSVS/vs-7.1-files.py new file mode 100644 index 0000000..71670fa --- /dev/null +++ b/test/MSVS/vs-7.1-files.py @@ -0,0 +1,215 @@ +#!/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 generate Visual Studio 7.1 project (.vcproj) and +solution (.sln) files that look correct. +""" + +import os +import os.path +import sys + +import TestCmd +import TestSCons + +test = TestSCons.TestSCons(match = TestCmd.match_re) + +if sys.platform != 'win32': + msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + +expected_slnfile = """\ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "{SLNGUID}" +\tProjectSection(ProjectDependencies) = postProject +\tEndProjectSection +EndProject +Global +\tGlobalSection(SolutionConfiguration) = preSolution +\t\tConfigName.0 = Release +\tEndGlobalSection +\tGlobalSection(ProjectConfiguration) = postSolution +\t\t{SLNGUID}.Release.ActiveCfg = Release|Win32 +\t\t{SLNGUID}.Release.Build.0 = Release|Win32 +\tEndGlobalSection +\tGlobalSection(ExtensibilityGlobals) = postSolution +\tEndGlobalSection +\tGlobalSection(ExtensibilityAddIns) = postSolution +\tEndGlobalSection +EndGlobal +""" + +expected_vcprojfile = """\ + + +\t +\t\t +\t +\t +\t\t +\t\t\t +\t\t +\t +\t +\t +\t +\t\t +\t\t\t +\t\t\t +\t\t +\t\t +\t\t\t +\t\t\t +\t\t +\t\t +\t\t\t +\t\t\t +\t\t +\t\t +\t\t\t +\t\t\t +\t\t +\t\t +\t\t\t +\t\t\t +\t\t +\t\t +\t\t +\t +\t +\t + +""" + + + +test.subdir('work1') + +test.write(['work1', 'SConstruct'], """\ +env=Environment(MSVS_VERSION = '7.1') + +testsrc = ['test.cpp'] +testincs = ['sdk.h'] +testlocalincs = ['test.h'] +testresources = ['test.rc'] +testmisc = ['readme.txt'] + +env.MSVSProject(target = 'Test.vcproj', + slnguid = '{SLNGUID}', + srcs = testsrc, + incs = testincs, + localincs = testlocalincs, + resources = testresources, + misc = testmisc, + buildtarget = 'Test.exe', + variant = 'Release') +""") + +test.run(chdir='work1', arguments="Test.vcproj") + +test.must_exist(test.workpath('work1', 'Test.vcproj')) +vcproj = test.read(['work1', 'Test.vcproj'], 'r') +expect = test.msvs_substitute(expected_vcprojfile, '7.1', 'work1') +# don't compare the pickled data +assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + +test.must_exist(test.workpath('work1', 'Test.sln')) +sln = test.read(['work1', 'Test.sln'], 'r') +expect = test.msvs_substitute(expected_slnfile, '7.1', 'work1') +# don't compare the pickled data +assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) + +test.run(chdir='work1', arguments='-c .') + +test.must_not_exist(test.workpath('work1', 'Test.vcproj')) +test.must_not_exist(test.workpath('work1', 'Test.sln')) + +test.run(chdir='work1', arguments='Test.vcproj') + +test.must_exist(test.workpath('work1', 'Test.vcproj')) +test.must_exist(test.workpath('work1', 'Test.sln')) + +test.run(chdir='work1', arguments='-c Test.sln') + +test.must_not_exist(test.workpath('work1', 'Test.vcproj')) +test.must_not_exist(test.workpath('work1', 'Test.sln')) + + + +# Test that running SCons with $PYTHON_ROOT in the environment +# changes the .vcproj output as expected. +os.environ['PYTHON_ROOT'] = 'xyzzy' + +test.run(chdir='work1', arguments='Test.vcproj') + +python = os.path.join('$(PYTHON_ROOT)', os.path.split(sys.executable)[1]) + +test.must_exist(test.workpath('work1', 'Test.vcproj')) +vcproj = test.read(['work1', 'Test.vcproj'], 'r') +expect = test.msvs_substitute(expected_vcprojfile, '7.1', 'work1', python=python) +# don't compare the pickled data +assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + +os.environ['PYTHON_ROOT'] = '' + + + +test.pass_test() diff --git a/test/MSVS/vs-7.1.py b/test/MSVS/vs-7.1.py deleted file mode 100644 index 894ec01..0000000 --- a/test/MSVS/vs-7.1.py +++ /dev/null @@ -1,270 +0,0 @@ -#!/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__" - -import os -import os.path -import string -import sys - -import TestCmd -import TestSCons - -test = TestSCons.TestSCons(match = TestCmd.match_re) - -if sys.platform != 'win32': - msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform - test.skip_test(msg) - -if not '7.1' in test.msvs_versions(): - msg = "Visual Studio 7.1 not installed; skipping test.\n" - test.skip_test(msg) - -def diff_section(expect, actual): - i = 0 - for x, y in zip(expect, actual): - if x != y: - return "Actual did not match expect at char %d:\n" \ - " Expect: %s\n" \ - " Actual: %s\n" \ - % (i, repr(expect[i-20:i+40]), repr(actual[i-20:i+40])) - i = i + 1 - return "Actual matched the expected output???" - -expected_slnfile = """\ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "{SLNGUID}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {SLNGUID}.Release.ActiveCfg = Release|Win32 - {SLNGUID}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal -""" - -expected_vcprojfile = """\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -""" - -test.write('SConstruct', """\ -env=Environment(MSVS_VERSION = '7.1') - -testsrc = ['test.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -env.MSVSProject(target = 'Test.vcproj', - slnguid = '{SLNGUID}', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release') -""") - -test.run(arguments="Test.vcproj") - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '7.1') -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, diff_section(expect, vcproj) - - -test.must_exist(test.workpath('Test.sln')) -sln = test.read('Test.sln', 'r') -expect = test.msvs_substitute(expected_slnfile, '7.1') -# don't compare the pickled data -assert sln[:len(expect)] == expect, diff_section(expect, sln) - -test.run(arguments='-c .') - -test.must_not_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - -test.run(arguments='Test.vcproj') - -test.must_exist(test.workpath('Test.vcproj')) -test.must_exist(test.workpath('Test.sln')) - -test.run(arguments='-c Test.sln') - -test.must_not_exist(test.workpath('Test.vcproj')) -test.must_not_exist(test.workpath('Test.sln')) - - - - -# Test that running SCons with $PYTHON_ROOT in the environment -# changes the .vcproj output as expected. -os.environ['PYTHON_ROOT'] = 'xyzzy' - -test.run(arguments='Test.vcproj') - -python = os.path.join('$(PYTHON_ROOT)', os.path.split(sys.executable)[1]) - -test.must_exist(test.workpath('Test.vcproj')) -vcproj = test.read('Test.vcproj', 'r') -expect = test.msvs_substitute(expected_vcprojfile, '7.1', python=python) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, diff_section(expect, vcproj) - -os.environ['PYTHON_ROOT'] = '' - - - -test.write('SConstruct', """\ -env=Environment(MSVS_VERSION = '7.1') - -env.MSVSProject(target = 'foo.vcproj', - srcs = ['foo.c'], - buildtarget = 'foo.exe', - variant = 'Release') - -t = env.Program('foo.c') -print "t =", t[0] -print "t =", t[0].abspath -import sys -print sys.argv -""") - -test.write('foo.c', r""" -int -main(int argc, char *argv) -{ - printf("test.c\n"); - exit (0); -} -""") - -# 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']) -print "os.environ.update(%s)" % repr(env['ENV']) -""") - -exec(test.stdout()) - -test.run(arguments='foo.vcproj') - -test.vcproj_sys_path('foo.vcproj') - -test.run(program=['devenv'], - arguments=['foo.sln', '/build', 'Release']) - -test.run(program=test.workpath('foo'), stdout = "test.c\n") - - - -test.pass_test() -- cgit v0.12