diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-05-06 10:37:22 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-05-06 10:37:22 -0230 |
| commit | 5571b3d1849bde9c3e54724e15a5fa8c5370f178 (patch) | |
| tree | f95bb214bc4d8c69b426c943062a67b0f2ab09e7 /scripts/TestUtil.py | |
| parent | Fixed ICE-6482: Cleanup WinRT makefiles, other WinRT minor fixes (diff) | |
| download | ice-5571b3d1849bde9c3e54724e15a5fa8c5370f178.tar.bz2 ice-5571b3d1849bde9c3e54724e15a5fa8c5370f178.tar.xz ice-5571b3d1849bde9c3e54724e15a5fa8c5370f178.zip | |
Only add csharp to all-cross on Windows, add objective-c to all-cross on OSX.
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 04d91782910..0612db25079 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -395,7 +395,7 @@ if not iceHome: crossTests = [ "Ice/adapterDeactivation", #"Ice/background", "Ice/binding", - "Ice/checksum", + #"Ice/checksum", #"Ice/custom", "Ice/ami", "Ice/info", @@ -592,9 +592,17 @@ def run(tests, root = False): if allCross: if len(cross) == 0: - cross = ["cpp", "java", "js", "csharp" ] + cross = ["cpp", "java", "js"] + if isWin32(): + cross.append("csharp") + if isDarwin(): + cross.append("objective-c") if root: - allLang = ["cpp", "java", "js", "csharp" ] + allLang = ["cpp", "java", "js"] + if isWin32(): + allLang.append("csharp") + if isDarwin(): + allLang.append("objective-c") else: allLang = [ getDefaultMapping() ] for lang in allLang: |