diff options
| author | Robert Managan <ramanagan@att.net> | 2012-11-10 17:06:02 (GMT) |
|---|---|---|
| committer | Robert Managan <ramanagan@att.net> | 2012-11-10 17:06:02 (GMT) |
| commit | 4bd813d80758da1feecbf998d3e497b5fd895cb3 (patch) | |
| tree | ed1170051162594847fc8fc3f23b99ab6ff3c988 /test | |
| parent | 57eacf5ab172af6072d334728029416c23eb53b4 (diff) | |
| parent | a9145df8c3056bc0daae495aac1280ad6ac95394 (diff) | |
| download | SCons-4bd813d80758da1feecbf998d3e497b5fd895cb3.zip SCons-4bd813d80758da1feecbf998d3e497b5fd895cb3.tar.gz SCons-4bd813d80758da1feecbf998d3e497b5fd895cb3.tar.bz2 | |
merge latest commits from SCons main line
Diffstat (limited to 'test')
| -rw-r--r-- | test/MSVS/vs-10.0-files.py | 12 | ||||
| -rw-r--r-- | test/MSVS/vs-11.0-files.py | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/test/MSVS/vs-10.0-files.py b/test/MSVS/vs-10.0-files.py index 43ce243..8cdc152 100644 --- a/test/MSVS/vs-10.0-files.py +++ b/test/MSVS/vs-10.0-files.py @@ -53,10 +53,11 @@ test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch}) test.run(arguments="Test.vcxproj") test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') +test.must_exist(test.workpath('Test.vcxproj.filters')) +vcxproj = test.read('Test.vcxproj', 'r') expect = test.msvs_substitute(expected_vcprojfile, '10.0', None, 'SConstruct') # don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) +assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) test.must_exist(test.workpath('Test.sln')) sln = test.read('Test.sln', 'r') @@ -67,16 +68,19 @@ assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) test.run(arguments='-c .') test.must_not_exist(test.workpath('Test.vcxproj')) +test.must_not_exist(test.workpath('Test.vcxproj.filters')) test.must_not_exist(test.workpath('Test.sln')) test.run(arguments='Test.vcxproj') test.must_exist(test.workpath('Test.vcxproj')) +test.must_exist(test.workpath('Test.vcxproj.filters')) test.must_exist(test.workpath('Test.sln')) test.run(arguments='-c Test.sln') test.must_not_exist(test.workpath('Test.vcxproj')) +test.must_not_exist(test.workpath('Test.vcxproj.filters')) test.must_not_exist(test.workpath('Test.sln')) @@ -89,11 +93,11 @@ python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) test.run(arguments='Test.vcxproj') test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') +vcxproj = test.read('Test.vcxproj', 'r') expect = test.msvs_substitute(expected_vcprojfile, '10.0', None, 'SConstruct', python=python) # don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) +assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) diff --git a/test/MSVS/vs-11.0-files.py b/test/MSVS/vs-11.0-files.py index 53d8271..6c4933c 100644 --- a/test/MSVS/vs-11.0-files.py +++ b/test/MSVS/vs-11.0-files.py @@ -53,10 +53,11 @@ test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch}) test.run(arguments="Test.vcxproj") test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') +test.must_exist(test.workpath('Test.vcxproj.filters')) +vcxproj = test.read('Test.vcxproj', 'r') expect = test.msvs_substitute(expected_vcprojfile, '11.0', None, 'SConstruct') # don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) +assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) test.must_exist(test.workpath('Test.sln')) sln = test.read('Test.sln', 'r') @@ -67,16 +68,19 @@ assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) test.run(arguments='-c .') test.must_not_exist(test.workpath('Test.vcxproj')) +test.must_not_exist(test.workpath('Test.vcxproj.filters')) test.must_not_exist(test.workpath('Test.sln')) test.run(arguments='Test.vcxproj') test.must_exist(test.workpath('Test.vcxproj')) +test.must_exist(test.workpath('Test.vcxproj.filters')) test.must_exist(test.workpath('Test.sln')) test.run(arguments='-c Test.sln') test.must_not_exist(test.workpath('Test.vcxproj')) +test.must_not_exist(test.workpath('Test.vcxproj.filters')) test.must_not_exist(test.workpath('Test.sln')) @@ -89,11 +93,11 @@ python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSConsMSVS.python)[1]) test.run(arguments='Test.vcxproj') test.must_exist(test.workpath('Test.vcxproj')) -vcproj = test.read('Test.vcxproj', 'r') +vcxproj = test.read('Test.vcxproj', 'r') expect = test.msvs_substitute(expected_vcprojfile, '11.0', None, 'SConstruct', python=python) # don't compare the pickled data -assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) +assert vcxproj[:len(expect)] == expect, test.diff_substr(expect, vcxproj) |