diff options
author | Steven Knight <knight@baldmt.com> | 2008-09-24 12:08:07 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2008-09-24 12:08:07 (GMT) |
commit | af3c530b230be367f9d785598bf85e04f293cadd (patch) | |
tree | ac02f3938908173e108d7d65575d06d75dca79bb /test | |
parent | 0eaf4cac515454264cc8944c95ef844b7ccc52f2 (diff) | |
download | SCons-af3c530b230be367f9d785598bf85e04f293cadd.zip SCons-af3c530b230be367f9d785598bf85e04f293cadd.tar.gz SCons-af3c530b230be367f9d785598bf85e04f293cadd.tar.bz2 |
Split the sub-tests for cleaning MSVS project and solution files
into separate test scripts.
Diffstat (limited to 'test')
-rw-r--r-- | test/MSVS/vs-6.0-clean.py | 105 | ||||
-rw-r--r-- | test/MSVS/vs-6.0-files.py | 61 | ||||
-rw-r--r-- | test/MSVS/vs-7.0-clean.py | 106 | ||||
-rw-r--r-- | test/MSVS/vs-7.0-files.py | 63 | ||||
-rw-r--r-- | test/MSVS/vs-7.1-clean.py | 106 | ||||
-rw-r--r-- | test/MSVS/vs-7.1-files.py | 63 | ||||
-rw-r--r-- | test/MSVS/vs-8.0-clean.py | 106 | ||||
-rw-r--r-- | test/MSVS/vs-8.0-files.py | 63 |
8 files changed, 423 insertions, 250 deletions
diff --git a/test/MSVS/vs-6.0-clean.py b/test/MSVS/vs-6.0-clean.py new file mode 100644 index 0000000..90655f4 --- /dev/null +++ b/test/MSVS/vs-6.0-clean.py @@ -0,0 +1,105 @@ +#!/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 -c option's ability to clean generated Visual Studio 6 +project (.dsp) and solution (.dsw) files. +""" + +import TestSConsMSVS + +test = TestSConsMSVS.TestSConsMSVS() + +# Make the test infrastructure think we have this version of MSVS installed. +test._msvs_versions = ['6.0'] + + + +expected_dspfile = TestSConsMSVS.expected_dspfile_6_0 +expected_dswfile = TestSConsMSVS.expected_dswfile_6_0 + + + +test.write('SConstruct', """\ +env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='6.0') + +testsrc = ['test.c'] +testincs = ['sdk.h'] +testlocalincs = ['test.h'] +testresources = ['test.rc'] +testmisc = ['readme.txt'] + +p = env.MSVSProject(target = 'Test.dsp', + srcs = testsrc, + incs = testincs, + localincs = testlocalincs, + resources = testresources, + misc = testmisc, + buildtarget = 'Test.exe', + variant = 'Release', + auto_build_solution = 0) + +env.MSVSSolution(target = 'Test.dsw', + slnguid = '{SLNGUID}', + projects = [p], + variant = 'Release') +""") + +test.run(arguments=".") + +test.must_exist(test.workpath('Test.dsp')) +dsp = test.read('Test.dsp', 'r') +expect = test.msvs_substitute(expected_dspfile, '6.0', None, 'SConstruct') +# don't compare the pickled data +assert dsp[:len(expect)] == expect, test.diff_substr(expect, dsp) + +test.must_exist(test.workpath('Test.dsw')) +dsw = test.read('Test.dsw', 'r') +expect = test.msvs_substitute(expected_dswfile, '6.0', None, 'SConstruct') +assert dsw == expect, test.diff_substr(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.must_exist(test.workpath('Test.dsp')) +test.must_exist(test.workpath('Test.dsw')) + +test.run(arguments='-c Test.dsw') + +test.must_exist(test.workpath('Test.dsp')) +test.must_not_exist(test.workpath('Test.dsw')) + +test.run(arguments='-c Test.dsp') + +test.must_not_exist(test.workpath('Test.dsp')) + + + +test.pass_test() diff --git a/test/MSVS/vs-6.0-files.py b/test/MSVS/vs-6.0-files.py index c39f9f6..7287e5a 100644 --- a/test/MSVS/vs-6.0-files.py +++ b/test/MSVS/vs-6.0-files.py @@ -118,65 +118,4 @@ The real workspace file is here: -test.subdir('work3') - -test.write(['work3', 'SConstruct'], """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='6.0') - -testsrc = ['test.c'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -p = env.MSVSProject(target = 'Test.dsp', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release', - auto_build_solution = 0) - -env.MSVSSolution(target = 'Test.dsw', - slnguid = '{SLNGUID}', - projects = [p], - variant = 'Release') -""") - -test.run(chdir='work3', arguments=".") - -test.must_exist(test.workpath('work3', 'Test.dsp')) -dsp = test.read(['work3', 'Test.dsp'], 'r') -expect = test.msvs_substitute(expected_dspfile, '6.0', 'work3', 'SConstruct') -# don't compare the pickled data -assert dsp[:len(expect)] == expect, test.diff_substr(expect, dsp) - -test.must_exist(test.workpath('work3', 'Test.dsw')) -dsw = test.read(['work3', 'Test.dsw'], 'r') -expect = test.msvs_substitute(expected_dswfile, '6.0', 'work3', 'SConstruct') -assert dsw == expect, test.diff_substr(expect, dsw) - -test.run(chdir='work3', arguments='-c .') - -test.must_not_exist(test.workpath('work3', 'Test.dsp')) -test.must_not_exist(test.workpath('work3', 'Test.dsw')) - -test.run(chdir='work3', arguments='.') - -test.must_exist(test.workpath('work3', 'Test.dsp')) -test.must_exist(test.workpath('work3', 'Test.dsw')) - -test.run(chdir='work3', arguments='-c Test.dsw') - -test.must_exist(test.workpath('work3', 'Test.dsp')) -test.must_not_exist(test.workpath('work3', 'Test.dsw')) - -test.run(chdir='work3', arguments='-c Test.dsp') - -test.must_not_exist(test.workpath('work3', 'Test.dsp')) - - - test.pass_test() diff --git a/test/MSVS/vs-7.0-clean.py b/test/MSVS/vs-7.0-clean.py new file mode 100644 index 0000000..bf44339 --- /dev/null +++ b/test/MSVS/vs-7.0-clean.py @@ -0,0 +1,106 @@ +#!/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 -c option's ability to clean generated Visual Studio 7.0 +project (.vcproj) and solution (.sln) files. +""" + +import TestSConsMSVS + +test = TestSConsMSVS.TestSConsMSVS() + +# Make the test infrastructure think we have this version of MSVS installed. +test._msvs_versions = ['7.0'] + + + +expected_slnfile = TestSConsMSVS.expected_slnfile_7_0 +expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_7_0 + + + +test.write('SConstruct', """\ +env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.0') + +testsrc = ['test1.cpp', 'test2.cpp'] +testincs = ['sdk.h'] +testlocalincs = ['test.h'] +testresources = ['test.rc'] +testmisc = ['readme.txt'] + +p = env.MSVSProject(target = 'Test.vcproj', + srcs = testsrc, + incs = testincs, + localincs = testlocalincs, + resources = testresources, + misc = testmisc, + buildtarget = 'Test.exe', + variant = 'Release', + auto_build_solution = 0) + +env.MSVSSolution(target = 'Test.sln', + slnguid = '{SLNGUID}', + projects = [p], + variant = 'Release') +""") + +test.run(arguments=".") + +test.must_exist(test.workpath('Test.vcproj')) +vcproj = test.read('Test.vcproj', 'r') +expect = test.msvs_substitute(expected_vcprojfile, '7.0', None, 'SConstruct') +# don't compare the pickled data +assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + +test.must_exist(test.workpath('Test.sln')) +sln = test.read('Test.sln', 'r') +expect = test.msvs_substitute(expected_slnfile, '7.0', None, 'SConstruct') +# don't compare the pickled data +assert sln[:len(expect)] == expect, test.diff_substr(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.must_exist(test.workpath('Test.vcproj')) +test.must_exist(test.workpath('Test.sln')) + +test.run(arguments='-c Test.sln') + +test.must_exist(test.workpath('Test.vcproj')) +test.must_not_exist(test.workpath('Test.sln')) + +test.run(arguments='-c Test.vcproj') + +test.must_not_exist(test.workpath('Test.vcproj')) + + + +test.pass_test() diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py index abb3445..c8134e9 100644 --- a/test/MSVS/vs-7.0-files.py +++ b/test/MSVS/vs-7.0-files.py @@ -141,67 +141,4 @@ The real workspace file is here: -test.subdir('work3') - -test.write(['work3', 'SConstruct'], """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.0') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -p = env.MSVSProject(target = 'Test.vcproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release', - auto_build_solution = 0) - -env.MSVSSolution(target = 'Test.sln', - slnguid = '{SLNGUID}', - projects = [p], - variant = 'Release') -""") - -test.run(chdir='work3', arguments=".") - -test.must_exist(test.workpath('work3', 'Test.vcproj')) -vcproj = test.read(['work3', 'Test.vcproj'], 'r') -expect = test.msvs_substitute(expected_vcprojfile, '7.0', 'work3', 'SConstruct', - python=python) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('work3', 'Test.sln')) -sln = test.read(['work3', 'Test.sln'], 'r') -expect = test.msvs_substitute(expected_slnfile, '7.0', 'work3', 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -test.run(chdir='work3', arguments='-c .') - -test.must_not_exist(test.workpath('work3', 'Test.vcproj')) -test.must_not_exist(test.workpath('work3', 'Test.sln')) - -test.run(chdir='work3', arguments='.') - -test.must_exist(test.workpath('work3', 'Test.vcproj')) -test.must_exist(test.workpath('work3', 'Test.sln')) - -test.run(chdir='work3', arguments='-c Test.sln') - -test.must_exist(test.workpath('work3', 'Test.vcproj')) -test.must_not_exist(test.workpath('work3', 'Test.sln')) - -test.run(chdir='work3', arguments='-c Test.vcproj') - -test.must_not_exist(test.workpath('work3', 'Test.vcproj')) - - - test.pass_test() diff --git a/test/MSVS/vs-7.1-clean.py b/test/MSVS/vs-7.1-clean.py new file mode 100644 index 0000000..2e8bb99 --- /dev/null +++ b/test/MSVS/vs-7.1-clean.py @@ -0,0 +1,106 @@ +#!/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 -c option's ability to clean generated Visual Studio 7.1 +project (.vcproj) and solution (.sln) files. +""" + +import TestSConsMSVS + +test = TestSConsMSVS.TestSConsMSVS() + +# Make the test infrastructure think we have this version of MSVS installed. +test._msvs_versions = ['7.1'] + + + +expected_slnfile = TestSConsMSVS.expected_slnfile_7_1 +expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_7_1 + + + +test.write('SConstruct', """\ +env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.1') + +testsrc = ['test1.cpp', 'test2.cpp'] +testincs = ['sdk.h'] +testlocalincs = ['test.h'] +testresources = ['test.rc'] +testmisc = ['readme.txt'] + +p = env.MSVSProject(target = 'Test.vcproj', + srcs = testsrc, + incs = testincs, + localincs = testlocalincs, + resources = testresources, + misc = testmisc, + buildtarget = 'Test.exe', + variant = 'Release', + auto_build_solution = 0) + +env.MSVSSolution(target = 'Test.sln', + slnguid = '{SLNGUID}', + projects = [p], + variant = 'Release') +""") + +test.run(arguments=".") + +test.must_exist(test.workpath('Test.vcproj')) +vcproj = test.read('Test.vcproj', 'r') +expect = test.msvs_substitute(expected_vcprojfile, '7.1', None, 'SConstruct') +# don't compare the pickled data +assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + +test.must_exist(test.workpath('Test.sln')) +sln = test.read('Test.sln', 'r') +expect = test.msvs_substitute(expected_slnfile, '7.1', None, 'SConstruct') +# don't compare the pickled data +assert sln[:len(expect)] == expect, test.diff_substr(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.must_exist(test.workpath('Test.vcproj')) +test.must_exist(test.workpath('Test.sln')) + +test.run(arguments='-c Test.sln') + +test.must_exist(test.workpath('Test.vcproj')) +test.must_not_exist(test.workpath('Test.sln')) + +test.run(arguments='-c Test.vcproj') + +test.must_not_exist(test.workpath('Test.vcproj')) + + + +test.pass_test() diff --git a/test/MSVS/vs-7.1-files.py b/test/MSVS/vs-7.1-files.py index f6e7136..f797a38 100644 --- a/test/MSVS/vs-7.1-files.py +++ b/test/MSVS/vs-7.1-files.py @@ -141,67 +141,4 @@ The real workspace file is here: -test.subdir('work3') - -test.write(['work3', 'SConstruct'], """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.1') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -p = env.MSVSProject(target = 'Test.vcproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release', - auto_build_solution = 0) - -env.MSVSSolution(target = 'Test.sln', - slnguid = '{SLNGUID}', - projects = [p], - variant = 'Release') -""") - -test.run(chdir='work3', arguments=".") - -test.must_exist(test.workpath('work3', 'Test.vcproj')) -vcproj = test.read(['work3', 'Test.vcproj'], 'r') -expect = test.msvs_substitute(expected_vcprojfile, '7.1', 'work3', 'SConstruct', - python=python) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('work3', 'Test.sln')) -sln = test.read(['work3', 'Test.sln'], 'r') -expect = test.msvs_substitute(expected_slnfile, '7.1', 'work3', 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -test.run(chdir='work3', arguments='-c .') - -test.must_not_exist(test.workpath('work3', 'Test.vcproj')) -test.must_not_exist(test.workpath('work3', 'Test.sln')) - -test.run(chdir='work3', arguments='.') - -test.must_exist(test.workpath('work3', 'Test.vcproj')) -test.must_exist(test.workpath('work3', 'Test.sln')) - -test.run(chdir='work3', arguments='-c Test.sln') - -test.must_exist(test.workpath('work3', 'Test.vcproj')) -test.must_not_exist(test.workpath('work3', 'Test.sln')) - -test.run(chdir='work3', arguments='-c Test.vcproj') - -test.must_not_exist(test.workpath('work3', 'Test.vcproj')) - - - test.pass_test() diff --git a/test/MSVS/vs-8.0-clean.py b/test/MSVS/vs-8.0-clean.py new file mode 100644 index 0000000..4c023d0 --- /dev/null +++ b/test/MSVS/vs-8.0-clean.py @@ -0,0 +1,106 @@ +#!/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 -c option's ability to clean generated Visual Studio 8.0 +project (.vcproj) and solution (.sln) files. +""" + +import TestSConsMSVS + +test = TestSConsMSVS.TestSConsMSVS() + +# Make the test infrastructure think we have this version of MSVS installed. +test._msvs_versions = ['8.0'] + + + +expected_slnfile = TestSConsMSVS.expected_slnfile_8_0 +expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_8_0 + + + +test.write('SConstruct', """\ +env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='8.0') + +testsrc = ['test1.cpp', 'test2.cpp'] +testincs = ['sdk.h'] +testlocalincs = ['test.h'] +testresources = ['test.rc'] +testmisc = ['readme.txt'] + +p = env.MSVSProject(target = 'Test.vcproj', + srcs = testsrc, + incs = testincs, + localincs = testlocalincs, + resources = testresources, + misc = testmisc, + buildtarget = 'Test.exe', + variant = 'Release', + auto_build_solution = 0) + +env.MSVSSolution(target = 'Test.sln', + slnguid = '{SLNGUID}', + projects = [p], + variant = 'Release') +""") + +test.run(arguments=".") + +test.must_exist(test.workpath('Test.vcproj')) +vcproj = test.read('Test.vcproj', 'r') +expect = test.msvs_substitute(expected_vcprojfile, '8.0', None, 'SConstruct') +# don't compare the pickled data +assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) + +test.must_exist(test.workpath('Test.sln')) +sln = test.read('Test.sln', 'r') +expect = test.msvs_substitute(expected_slnfile, '8.0', None, 'SConstruct') +# don't compare the pickled data +assert sln[:len(expect)] == expect, test.diff_substr(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.must_exist(test.workpath('Test.vcproj')) +test.must_exist(test.workpath('Test.sln')) + +test.run(arguments='-c Test.sln') + +test.must_exist(test.workpath('Test.vcproj')) +test.must_not_exist(test.workpath('Test.sln')) + +test.run(arguments='-c Test.vcproj') + +test.must_not_exist(test.workpath('Test.vcproj')) + + + +test.pass_test() diff --git a/test/MSVS/vs-8.0-files.py b/test/MSVS/vs-8.0-files.py index bc0ae5d..d5d210a 100644 --- a/test/MSVS/vs-8.0-files.py +++ b/test/MSVS/vs-8.0-files.py @@ -145,67 +145,4 @@ The real workspace file is here: -test.subdir('work3') - -test.write(['work3', 'SConstruct'], """\ -env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='8.0') - -testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] -testlocalincs = ['test.h'] -testresources = ['test.rc'] -testmisc = ['readme.txt'] - -p = env.MSVSProject(target = 'Test.vcproj', - srcs = testsrc, - incs = testincs, - localincs = testlocalincs, - resources = testresources, - misc = testmisc, - buildtarget = 'Test.exe', - variant = 'Release', - auto_build_solution = 0) - -env.MSVSSolution(target = 'Test.sln', - slnguid = '{SLNGUID}', - projects = [p], - variant = 'Release') -""") - -test.run(chdir='work3', arguments=".") - -test.must_exist(test.workpath('work3', 'Test.vcproj')) -vcproj = test.read(['work3', 'Test.vcproj'], 'r') -expect = test.msvs_substitute(expected_vcprojfile, '8.0', 'work3', 'SConstruct', - python=python) -# don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) - -test.must_exist(test.workpath('work3', 'Test.sln')) -sln = test.read(['work3', 'Test.sln'], 'r') -expect = test.msvs_substitute(expected_slnfile, '8.0', 'work3', 'SConstruct') -# don't compare the pickled data -assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) - -test.run(chdir='work3', arguments='-c .') - -test.must_not_exist(test.workpath('work3', 'Test.vcproj')) -test.must_not_exist(test.workpath('work3', 'Test.sln')) - -test.run(chdir='work3', arguments='.') - -test.must_exist(test.workpath('work3', 'Test.vcproj')) -test.must_exist(test.workpath('work3', 'Test.sln')) - -test.run(chdir='work3', arguments='-c Test.sln') - -test.must_exist(test.workpath('work3', 'Test.vcproj')) -test.must_not_exist(test.workpath('work3', 'Test.sln')) - -test.run(chdir='work3', arguments='-c Test.vcproj') - -test.must_not_exist(test.workpath('work3', 'Test.vcproj')) - - - test.pass_test() |