summaryrefslogtreecommitdiffstats
path: root/test/MSVS/vs-10.0-files.py
diff options
context:
space:
mode:
authorstopiccot <devnull@localhost>2012-10-24 20:59:23 (GMT)
committerstopiccot <devnull@localhost>2012-10-24 20:59:23 (GMT)
commita9145df8c3056bc0daae495aac1280ad6ac95394 (patch)
treee48416a34af5363e9b287b64b8ad02450addd017 /test/MSVS/vs-10.0-files.py
parent6f33c11e7a3c5bc42e1543d303e3512c1c2d2b48 (diff)
downloadSCons-a9145df8c3056bc0daae495aac1280ad6ac95394.zip
SCons-a9145df8c3056bc0daae495aac1280ad6ac95394.tar.gz
SCons-a9145df8c3056bc0daae495aac1280ad6ac95394.tar.bz2
vcxproj.filters files should be removed upon clean
Diffstat (limited to 'test/MSVS/vs-10.0-files.py')
-rw-r--r--test/MSVS/vs-10.0-files.py12
1 files changed, 8 insertions, 4 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)