diff options
author | Steven Knight <knight@baldmt.com> | 2006-02-12 19:56:03 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2006-02-12 19:56:03 (GMT) |
commit | 92e52b195125e7fc89721570c0b9237105d635da (patch) | |
tree | 56208f374c81c91b572cd0fc3cf28223ef80a732 /test/MSVS | |
parent | 7bc5b0f51a17b8ea1e49cfe917a98610791d67aa (diff) | |
download | SCons-92e52b195125e7fc89721570c0b9237105d635da.zip SCons-92e52b195125e7fc89721570c0b9237105d635da.tar.gz SCons-92e52b195125e7fc89721570c0b9237105d635da.tar.bz2 |
Add support for Visual Studio 2005 Professional. Windows portability fixes for various tests. (Baptiste Lepilleur)
Diffstat (limited to 'test/MSVS')
-rw-r--r-- | test/MSVS/vs-6.0-exec.py | 2 | ||||
-rw-r--r-- | test/MSVS/vs-7.0-exec.py | 2 | ||||
-rw-r--r-- | test/MSVS/vs-7.1-exec.py | 2 | ||||
-rw-r--r-- | test/MSVS/vs-8.0-exec.py | 6 |
4 files changed, 8 insertions, 4 deletions
diff --git a/test/MSVS/vs-6.0-exec.py b/test/MSVS/vs-6.0-exec.py index a963772..3fe3f16 100644 --- a/test/MSVS/vs-6.0-exec.py +++ b/test/MSVS/vs-6.0-exec.py @@ -84,7 +84,7 @@ main(int argc, char *argv) test.run(chdir='sub dir', arguments='.') test.run(chdir='sub dir', - program=['msdev'], + program=[test.get_msvs_executable('6.0')], arguments=['Test.dsp', '/MAKE', 'foo - Win32 Release']) test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n") diff --git a/test/MSVS/vs-7.0-exec.py b/test/MSVS/vs-7.0-exec.py index 8700d41..c4ef414 100644 --- a/test/MSVS/vs-7.0-exec.py +++ b/test/MSVS/vs-7.0-exec.py @@ -86,7 +86,7 @@ test.run(chdir='sub dir', arguments='.') test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj')) test.run(chdir='sub dir', - program=['devenv'], + program=[test.get_msvs_executable('7.0')], arguments=['foo.sln', '/build', 'Release']) test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n") diff --git a/test/MSVS/vs-7.1-exec.py b/test/MSVS/vs-7.1-exec.py index ea886b2..03fec81 100644 --- a/test/MSVS/vs-7.1-exec.py +++ b/test/MSVS/vs-7.1-exec.py @@ -86,7 +86,7 @@ test.run(chdir='sub dir', arguments='.') test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj')) test.run(chdir='sub dir', - program=['devenv'], + program=[test.get_msvs_executable('7.1')], arguments=['foo.sln', '/build', 'Release']) test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n") diff --git a/test/MSVS/vs-8.0-exec.py b/test/MSVS/vs-8.0-exec.py index 4554904..f41e2be 100644 --- a/test/MSVS/vs-8.0-exec.py +++ b/test/MSVS/vs-8.0-exec.py @@ -85,8 +85,12 @@ test.run(chdir='sub dir', arguments='.') test.vcproj_sys_path(test.workpath('sub dir', 'foo.vcproj')) +import SCons.Platform.win32 +system_dll_path = os.path.join( SCons.Platform.win32.get_system_root(), 'System32' ) +os.environ['PATH'] = os.environ['PATH'] + os.pathsep + system_dll_path + test.run(chdir='sub dir', - program=['devenv'], + program=[test.get_msvs_executable('8.0')], arguments=['foo.sln', '/build', 'Release']) test.run(program=test.workpath('sub dir', 'foo'), stdout="foo.c\n") |