diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2010-07-22 00:50:52 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2010-07-22 00:50:52 (GMT) |
| commit | 9628c70f7783023b917434f09cdcacedb8be5a85 (patch) | |
| tree | ba3a4ffd7dd0b713b16bc9af822e1ef9779229aa /test/MSVS/vs-7.0-variant_dir.py | |
| parent | f47c9af3748b0eb9c6f0b1d0f8aeec1dd9a0bfa1 (diff) | |
| download | SCons-9628c70f7783023b917434f09cdcacedb8be5a85.zip SCons-9628c70f7783023b917434f09cdcacedb8be5a85.tar.gz SCons-9628c70f7783023b917434f09cdcacedb8be5a85.tar.bz2 | |
Integrated patch for issue 2571, various fixes for MSVS project generation. From Jean-Franois Colson.
Diffstat (limited to 'test/MSVS/vs-7.0-variant_dir.py')
| -rw-r--r-- | test/MSVS/vs-7.0-variant_dir.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/MSVS/vs-7.0-variant_dir.py b/test/MSVS/vs-7.0-variant_dir.py index 9194785..5699663 100644 --- a/test/MSVS/vs-7.0-variant_dir.py +++ b/test/MSVS/vs-7.0-variant_dir.py @@ -56,14 +56,17 @@ test.write(['src', 'SConscript'], SConscript_contents%{'HOST_ARCH': host_arch}) test.run(arguments=".") +project_guid = "{25F6CE89-8E22-2910-8B6E-FFE6DC1E2792}" vcproj = test.read(['src', 'Test.vcproj'], 'r') -expect = test.msvs_substitute(expected_vcprojfile, '7.0', None, 'SConstruct') +expect = test.msvs_substitute(expected_vcprojfile, '7.0', None, 'SConstruct', + project_guid=project_guid) # don't compare the pickled data assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) test.must_exist(test.workpath('src', 'Test.sln')) sln = test.read(['src', 'Test.sln'], 'r') -expect = test.msvs_substitute(expected_slnfile, '7.0', 'src') +expect = test.msvs_substitute(expected_slnfile, '7.0', 'src', + project_guid=project_guid) # don't compare the pickled data assert sln[:len(expect)] == expect, test.diff_substr(expect, sln) |