diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-03-06 16:22:19 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-03-06 16:22:19 +0100 |
| commit | b150bf2fb07469bbe5f9c0d70397f286b661d134 (patch) | |
| tree | 066e13925deae76aa997fd4b8a97dbdc036f74d1 /scripts/TestUtil.py | |
| parent | ICE-5296 extra bin/vc110/slice35d.pdb file (diff) | |
| download | ice-b150bf2fb07469bbe5f9c0d70397f286b661d134.tar.bz2 ice-b150bf2fb07469bbe5f9c0d70397f286b661d134.tar.xz ice-b150bf2fb07469bbe5f9c0d70397f286b661d134.zip | |
Fixed ICE-5298 - cross tests don't work with --x64
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 4651bb3ede9..0793c16ce61 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -426,13 +426,13 @@ def run(tests, root = False): # This is all eligible cross tests for the current mapping. # Now expand out the tests. We run only tcp for most cross tests. for c in crossLang: - a = "--cross=%s --protocol=tcp" % c + a = "--cross=%s --protocol=tcp %s" % (c, arg) expanded.append([ ( "%s/test/%s" % (lang, test), a, []) for test in crossTests]) # Add ssl & compress for the operations test. if (compact or mono or silverlight) and c == "cs": # Don't add the ssl tests. continue - a = "--cross=%s --protocol=ssl --compress" % c + a = "--cross=%s --protocol=ssl --compress %s" % (c, arg) expanded.append([("%s/test/Ice/operations" % lang, a, [])]) # Apply filters after expanding. |