Thanks for the help! I just uploaded a final commit and now the tests are all passing: https://bitbucket.org/scons/scons/pull-request/241/add-visual-studio-2015-support-to-scons/commits
From: Scons-dev [mailto:[email protected]] On Behalf Of Bill Deegan Sent: Friday, July 17, 2015 3:56 PM To: SCons developer list Subject: Re: [Scons-dev] Adding Visual Studio 2015 Support to SCons See around line 1535 of src/engine/SCons/Tool/msvs.py On Fri, Jul 17, 2015 at 5:50 PM, Rob Smith (WINDOWS) <[email protected]<mailto:[email protected]>> wrote: No, my failures were with the changes I uploaded. The expected result of the test is correctly pulling version 14 from TestSConsMSVS.py, it is the actual that is failing. What scons code is generating the vcxproj file, and how do I fix it? C:\sd\scons-vs2015>\Python27\python.exe runtest.py test\MSVS\vs-14.0-files.py<http://vs-14.0-files.py> 1/1 (100.00%) C:\\Python27\\python.exe -tt test\MSVS\vs-14.0-files.py<http://vs-14.0-files.py> Traceback (most recent call last): File "test\MSVS\vs-14.0-files.py<http://vs-14.0-files.py>", line 66, in <module> assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) AssertionError: Actual did not match expect at char 55: Expect: 'le, Format Version 14.00\n# Visual Studio 14\nProject("{8BC9CE' Actual: 'le, Format Version 12.00\n# Visual Studio 11\nProject("{8BC9CE' From: Scons-dev [mailto:[email protected]<mailto:[email protected]>] On Behalf Of Bill Deegan Sent: Friday, July 17, 2015 2:29 PM To: SCons developer list Subject: Re: [Scons-dev] Adding Visual Studio 2015 Support to SCons I guess really most importantly we should check if the format of the .sln an other msvs project files has changed any and make sure that what SCons generates matches? (Besides making a test pass) -Bill On Fri, Jul 17, 2015 at 5:28 PM, Bill Deegan <[email protected]<mailto:[email protected]>> wrote: Rob, Did that resolve your failures? -Bill On Fri, Jul 17, 2015 at 5:10 PM, Rob Smith (WINDOWS) <[email protected]<mailto:[email protected]>> wrote: I’ve uploaded the latest changes, I switched the values in TestSConsMSVS to 14 inside the text. You can see the latest here: https://bitbucket.org/robsmsft/scons-vs2015/commits/all From: Scons-dev [mailto:[email protected]<mailto:[email protected]>] On Behalf Of Bill Deegan Sent: Friday, July 17, 2015 12:02 PM To: SCons developer list Subject: Re: [Scons-dev] Adding Visual Studio 2015 Support to SCons Rob, Looks like you modified QMTest/TestSConsMSVS.py but didn't check it in so I can't tell. But likely you copy/pasted the text from the _11_ to your _14_ and need to change to 14? Or... Do you have several versions of MSVS installed on your test machine? -Bill TestSConsMSVS.expected_slnfile_14_0 On Fri, Jul 17, 2015 at 2:19 PM, Rob Smith (WINDOWS) <[email protected]<mailto:[email protected]>> wrote: I created the new tests and vs-14.0-exec.py<http://vs-14.0-exec.py> is passing as expected. However, I’m hitting a failure with the other test cases and I don’t have enough knowledge of what the test is doing to figure out the issue. You can see the error below, I’ve updated the expected results to version 14, but it appears the Test.vcxproj generated by the test is still returning version 12. Where is this project file being generated, and how is it fixed? C:\sd\scons-vs2015>\Python27\python.exe runtest.py test\MSVS\vs-14.0-files.py<http://vs-14.0-files.py> 1/1 (100.00%) C:\\Python27\\python.exe -tt test\MSVS\vs-14.0-files.py<http://vs-14.0-files.py> Traceback (most recent call last): File "test\MSVS\vs-14.0-files.py<http://vs-14.0-files.py>", line 66, in <module> assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) AssertionError: Actual did not match expect at char 55: Expect: 'le, Format Version 14.00\n# Visual Studio 14\nProject("{8BC9CE' Actual: 'le, Format Version 12.00\n# Visual Studio 11\nProject("{8BC9CE' From: Scons-dev [mailto:[email protected]<mailto:[email protected]>] On Behalf Of Bill Deegan Sent: Wednesday, July 15, 2015 2:52 PM To: SCons developer list Subject: Re: [Scons-dev] Adding Visual Studio 2015 Support to SCons Rob, Thanks for the pull request. I looked at it yesterday. I was just refreshing my memory what tests we had for supporting each version of visual studio. Looks like we have tests for most versions of visual studio. Can you replicate what's in tests/MSVS for version 14? Generally we like to have some tests to cover all code additions/changes. By chance can Microsoft provide any buildbot slaves with each version of visual studio on it? http://buildbot.scons.org/waterfall We're always struggling to have a reasonable number of windows base buildbot slaves for platform testing. Thanks, Bill Co-Manager SCons Project On Wed, Jul 15, 2015 at 5:07 PM, Rob Smith (WINDOWS) <[email protected]<mailto:[email protected]>> wrote: I’ve submitted a pull request to add VS2015 support to SCons, what additional steps do I need to follow to get the patch submitted? Also, when is the next planned SCons release? As VS2015 is already available, we would love to have an official SCons release with support in the near future. https://bitbucket.org/scons/scons/pull-request/241/add-visual-studio-2015-support-to-scons/diff Thanks for the help, Rob _______________________________________________ Scons-dev mailing list [email protected]<mailto:[email protected]> https://pairlist2.pair.net/mailman/listinfo/scons-dev _______________________________________________ Scons-dev mailing list [email protected]<mailto:[email protected]> https://pairlist2.pair.net/mailman/listinfo/scons-dev _______________________________________________ Scons-dev mailing list [email protected]<mailto:[email protected]> https://pairlist2.pair.net/mailman/listinfo/scons-dev _______________________________________________ Scons-dev mailing list [email protected]<mailto:[email protected]> https://pairlist2.pair.net/mailman/listinfo/scons-dev
_______________________________________________ Scons-dev mailing list [email protected] https://pairlist2.pair.net/mailman/listinfo/scons-dev
