diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/MSVS/common-prefix.py | 138 | ||||
| -rw-r--r-- | test/MSVS/runfile.py | 130 | ||||
| -rw-r--r-- | test/MSVS/vs-7.0-files.py | 11 | ||||
| -rw-r--r-- | test/MSVS/vs-7.1-files.py | 11 | ||||
| -rw-r--r-- | test/MSVS/vs-8.0-files.py | 11 |
5 files changed, 289 insertions, 12 deletions
diff --git a/test/MSVS/common-prefix.py b/test/MSVS/common-prefix.py new file mode 100644 index 0000000..6f508c9 --- /dev/null +++ b/test/MSVS/common-prefix.py @@ -0,0 +1,138 @@ + +#!/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 8.0 project (.vcproj) and +solution (.sln) files that look correct. +""" + +import os +import os.path +import sys + +import TestCmd +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) + +expected_vcprojfile = """\ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject +\tProjectType="Visual C++" +\tVersion="8.00" +\tName="Test" +\tProjectGUID="<PROJECT_GUID>" +\tSccProjectName="" +\tSccLocalPath="" +\tRootNamespace="Test" +\tKeyword="MakeFileProj"> +\t<Platforms> +\t\t<Platform +\t\t\tName="Win32"/> +\t</Platforms> +\t<ToolFiles> +\t</ToolFiles> +\t<Configurations> +\t\t<Configuration +\t\t\tName="Release|Win32" +\t\t\tConfigurationType="0" +\t\t\tUseOfMFC="0" +\t\t\tATLMinimizesCRunTimeLibraryUsage="false" +\t\t\t> +\t\t\t<Tool +\t\t\t\tName="VCNMakeTool" +\t\t\t\tBuildCommandLine="echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct Test.exe" +\t\t\t\tReBuildCommandLine="echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct Test.exe" +\t\t\t\tCleanCommandLine="echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct -c Test.exe" +\t\t\t\tOutput="Test.exe" +\t\t\t\tPreprocessorDefinitions="" +\t\t\t\tIncludeSearchPath="" +\t\t\t\tForcedIncludes="" +\t\t\t\tAssemblySearchPath="" +\t\t\t\tForcedUsingAssemblies="" +\t\t\t\tCompileAsManaged="" +\t\t\t/> +\t\t</Configuration> +\t</Configurations> +\t<References> +\t</References> +\t<Files> +\t\t\t<Filter +\t\t\t\tName="subdir" +\t\t\t\tFilter=""> +\t\t\t<File +\t\t\t\tRelativePath="subdir\\test1.cpp"> +\t\t\t</File> +\t\t\t<File +\t\t\t\tRelativePath="subdir\\test2.cpp"> +\t\t\t</File> +\t\t\t</Filter> +\t\t<File +\t\t\tRelativePath="<SCONSCRIPT>"> +\t\t</File> +\t</Files> +\t<Globals> +\t</Globals> +</VisualStudioProject> +""" + + + +SConscript_contents = """\ +env=Environment(MSVS_VERSION = '8.0') + +testsrc = ['subdir/test1.cpp', r'subdir\\test2.cpp'] + +env.MSVSProject(target = 'Test.vcproj', + slnguid = '{SLNGUID}', + srcs = testsrc, + buildtarget = 'Test.exe', + variant = 'Release', + auto_build_solution = 0) +""" + + + +test.subdir('work1') + +test.write(['work1', 'SConstruct'], SConscript_contents) + +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, '8.0', 'work1', 'SConstruct') +# don't compare the pickled data +assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + + + +test.pass_test() diff --git a/test/MSVS/runfile.py b/test/MSVS/runfile.py new file mode 100644 index 0000000..581de64 --- /dev/null +++ b/test/MSVS/runfile.py @@ -0,0 +1,130 @@ + +#!/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 8.0 project (.vcproj) and +solution (.sln) files that look correct. +""" + +import os +import os.path +import sys + +import TestCmd +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) + +expected_vcprojfile = """\ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject +\tProjectType="Visual C++" +\tVersion="8.00" +\tName="Test" +\tProjectGUID="<PROJECT_GUID>" +\tSccProjectName="" +\tSccLocalPath="" +\tRootNamespace="Test" +\tKeyword="MakeFileProj"> +\t<Platforms> +\t\t<Platform +\t\t\tName="Win32"/> +\t</Platforms> +\t<ToolFiles> +\t</ToolFiles> +\t<Configurations> +\t\t<Configuration +\t\t\tName="Release|Win32" +\t\t\tConfigurationType="0" +\t\t\tUseOfMFC="0" +\t\t\tATLMinimizesCRunTimeLibraryUsage="false" +\t\t\t> +\t\t\t<Tool +\t\t\t\tName="VCNMakeTool" +\t\t\t\tBuildCommandLine="echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct Test.exe" +\t\t\t\tReBuildCommandLine="echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct Test.exe" +\t\t\t\tCleanCommandLine="echo Starting SCons && "<PYTHON>" -c "<SCONS_SCRIPT_MAIN_XML>" -C "<WORKPATH>" -f SConstruct -c Test.exe" +\t\t\t\tOutput="runfile.exe" +\t\t\t\tPreprocessorDefinitions="" +\t\t\t\tIncludeSearchPath="" +\t\t\t\tForcedIncludes="" +\t\t\t\tAssemblySearchPath="" +\t\t\t\tForcedUsingAssemblies="" +\t\t\t\tCompileAsManaged="" +\t\t\t/> +\t\t</Configuration> +\t</Configurations> +\t<References> +\t</References> +\t<Files> +\t\t\t<File +\t\t\t\tRelativePath="test.cpp"> +\t\t\t</File> +\t\t<File +\t\t\tRelativePath="<SCONSCRIPT>"> +\t\t</File> +\t</Files> +\t<Globals> +\t</Globals> +</VisualStudioProject> +""" + + + +SConscript_contents = """\ +env=Environment(MSVS_VERSION = '8.0') + +env.MSVSProject(target = 'Test.vcproj', + slnguid = '{SLNGUID}', + srcs = ['test.cpp'], + buildtarget = 'Test.exe', + runfile = 'runfile.exe', + variant = 'Release', + auto_build_solution = 0) +""" + + + +test.subdir('work1') + +test.write(['work1', 'SConstruct'], SConscript_contents) + +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, '8.0', 'work1', 'SConstruct') +# don't compare the pickled data +assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + + + +test.pass_test() diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py index e682607..8c82d1a 100644 --- a/test/MSVS/vs-7.0-files.py +++ b/test/MSVS/vs-7.0-files.py @@ -44,7 +44,7 @@ if sys.platform != 'win32': expected_slnfile = """\ Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "{SLNGUID}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "{E5466E26-0003-F18B-8F8A-BCD76C86388D}" EndProject Global \tGlobalSection(SolutionConfiguration) = preSolution @@ -126,7 +126,10 @@ expected_vcprojfile = """\ \t\t\tName="Source Files" \t\t\tFilter="cpp;c;cxx;l;y;def;odl;idl;hpj;bat"> \t\t\t<File -\t\t\t\tRelativePath="test.cpp"> +\t\t\t\tRelativePath="test1.cpp"> +\t\t\t</File> +\t\t\t<File +\t\t\t\tRelativePath="test2.cpp"> \t\t\t</File> \t\t</Filter> \t\t<File @@ -143,7 +146,7 @@ expected_vcprojfile = """\ SConscript_contents = """\ env=Environment(MSVS_VERSION = '7.0') -testsrc = ['test.cpp'] +testsrc = ['test1.cpp', 'test2.cpp'] testincs = ['sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] @@ -259,7 +262,7 @@ test.subdir('work3') test.write(['work3', 'SConstruct'], """\ env=Environment(MSVS_VERSION = '7.0') -testsrc = ['test.cpp'] +testsrc = ['test1.cpp', 'test2.cpp'] testincs = ['sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] diff --git a/test/MSVS/vs-7.1-files.py b/test/MSVS/vs-7.1-files.py index 131e4bd..bbe6f1e 100644 --- a/test/MSVS/vs-7.1-files.py +++ b/test/MSVS/vs-7.1-files.py @@ -44,7 +44,7 @@ if sys.platform != 'win32': expected_slnfile = """\ Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "{SLNGUID}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "{E5466E26-0003-F18B-8F8A-BCD76C86388D}" \tProjectSection(ProjectDependencies) = postProject \tEndProjectSection EndProject @@ -128,7 +128,10 @@ expected_vcprojfile = """\ \t\t\tName="Source Files" \t\t\tFilter="cpp;c;cxx;l;y;def;odl;idl;hpj;bat"> \t\t\t<File -\t\t\t\tRelativePath="test.cpp"> +\t\t\t\tRelativePath="test1.cpp"> +\t\t\t</File> +\t\t\t<File +\t\t\t\tRelativePath="test2.cpp"> \t\t\t</File> \t\t</Filter> \t\t<File @@ -145,7 +148,7 @@ expected_vcprojfile = """\ SConscript_contents = """\ env=Environment(MSVS_VERSION = '7.1') -testsrc = ['test.cpp'] +testsrc = ['test1.cpp', 'test2.cpp'] testincs = ['sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] @@ -261,7 +264,7 @@ test.subdir('work3') test.write(['work3', 'SConstruct'], """\ env=Environment(MSVS_VERSION = '7.1') -testsrc = ['test.cpp'] +testsrc = ['test1.cpp', 'test2.cpp'] testincs = ['sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] diff --git a/test/MSVS/vs-8.0-files.py b/test/MSVS/vs-8.0-files.py index 65d8246..878aa3f 100644 --- a/test/MSVS/vs-8.0-files.py +++ b/test/MSVS/vs-8.0-files.py @@ -45,7 +45,7 @@ if sys.platform != 'win32': expected_slnfile = """\ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "{SLNGUID}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcproj", "{E5466E26-0003-F18B-8F8A-BCD76C86388D}" EndProject Global \tGlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -135,7 +135,10 @@ expected_vcprojfile = """\ \t\t\tName="Source Files" \t\t\tFilter="cpp;c;cxx;l;y;def;odl;idl;hpj;bat"> \t\t\t<File -\t\t\t\tRelativePath="test.cpp"> +\t\t\t\tRelativePath="test1.cpp"> +\t\t\t</File> +\t\t\t<File +\t\t\t\tRelativePath="test2.cpp"> \t\t\t</File> \t\t</Filter> \t\t<File @@ -152,7 +155,7 @@ expected_vcprojfile = """\ SConscript_contents = """\ env=Environment(MSVS_VERSION = '8.0') -testsrc = ['test.cpp'] +testsrc = ['test1.cpp', 'test2.cpp'] testincs = ['sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] @@ -272,7 +275,7 @@ test.subdir('work3') test.write(['work3', 'SConstruct'], """\ env=Environment(MSVS_VERSION = '8.0') -testsrc = ['test.cpp'] +testsrc = ['test1.cpp', 'test2.cpp'] testincs = ['sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] |