summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2012-08-22 02:48:10 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2012-08-22 02:48:10 (GMT)
commitbc5b27c381326f7538053c6bdf090f712ab70c93 (patch)
tree160415b02df16039ce932ce0b1355c02645b4d57 /test
parent7c38a1132cebac8b5831f4eeb949fa6c179eb314 (diff)
downloadSCons-bc5b27c381326f7538053c6bdf090f712ab70c93.zip
SCons-bc5b27c381326f7538053c6bdf090f712ab70c93.tar.gz
SCons-bc5b27c381326f7538053c6bdf090f712ab70c93.tar.bz2
Fixed test rot in test/MSVS/CPPPATH-Dirs.py.
Visual Studio now creates .vcxproj rather than .vcproj. Made the test allow either one's existence to succeed.
Diffstat (limited to 'test')
-rw-r--r--test/MSVS/CPPPATH-Dirs.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/MSVS/CPPPATH-Dirs.py b/test/MSVS/CPPPATH-Dirs.py
index d1c24e3..fad2507 100644
--- a/test/MSVS/CPPPATH-Dirs.py
+++ b/test/MSVS/CPPPATH-Dirs.py
@@ -71,7 +71,9 @@ int main() {
test.run()
-test.must_exist(test.workpath('Hello.vcproj'))
+if not os.path.exists(test.workpath('Hello.vcproj')) and \
+ not os.path.exists(test.workpath('Hello.vcxproj')):
+ test.fail_test("Failed to create Visual Studio project Hello.vcproj or Hello.vcxproj")
test.must_exist(test.workpath('Hello.sln'))
# vcproj = test.read('Test.vcproj', 'r')