diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-28 09:24:04 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-28 09:24:04 +0100 |
| commit | a1116f5c2949b0db654e6b899cad635826d3abb4 (patch) | |
| tree | 6515f78f495c55e9a39b1ddd0dd4f243f6f6267a /scripts/TestUtil.py | |
| parent | Fixed build system to allow compiling JS on OS X (diff) | |
| download | ice-a1116f5c2949b0db654e6b899cad635826d3abb4.tar.bz2 ice-a1116f5c2949b0db654e6b899cad635826d3abb4.tar.xz ice-a1116f5c2949b0db654e6b899cad635826d3abb4.zip | |
Fixed ICE-5777: Python and C# Ice/ami test failures when run with other protocols than tcp
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 6ec47126644..42d4b2d595f 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1264,7 +1264,6 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "", global cross - if len(cross) > 0: if lang == "js": print("** skipping js cross test") @@ -1343,7 +1342,7 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "", def collocatedTest(additionalOptions = ""): lang = getDefaultMapping() - if len(cross) > 1 or cross[0] != lang: + if len(cross) > 0 and cross[0] != lang: print("** skipping cross test") return if silverlight: |