diff options
| author | Joe George <joe@zeroc.com> | 2016-07-28 10:24:21 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-07-28 10:24:21 -0400 |
| commit | 0256c4483f773138c8e60627b634bb1f9f2198ab (patch) | |
| tree | ad6e9ae096d56d90052653991dd5707178660bb0 /scripts/TestUtil.py | |
| parent | Removed extra space (diff) | |
| download | ice-0256c4483f773138c8e60627b634bb1f9f2198ab.tar.bz2 ice-0256c4483f773138c8e60627b634bb1f9f2198ab.tar.xz ice-0256c4483f773138c8e60627b634bb1f9f2198ab.zip | |
Remove php from cross tests if not VC140
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 362f4080da0..e629ed77f29 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -634,7 +634,12 @@ def run(tests, root = False): cross = ["cpp", "java", "js", "php", "python", "ruby"] if isWin32(): cross.append("csharp") - # TODO/XXX: we're currently not building Ruby on Windows + + # TODO: PHP only builds against VC140 + if getCppCompiler() != "VC140": + cross.remove('php') + + # TODO: We're currently not building Ruby on Windows cross.remove('ruby') if isDarwin(): cross.append("objective-c") |