diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-13 10:17:27 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-13 10:17:27 +0100 |
| commit | 99b44d083eeee5583adfe642081a827224fa1309 (patch) | |
| tree | 46bb3af634cbd5d90b9e5d46099f4e0e85f70ec6 /scripts/TestUtil.py | |
| parent | Cosmetic updates to IceGrid Admin connection wizard (diff) | |
| download | ice-99b44d083eeee5583adfe642081a827224fa1309.tar.bz2 ice-99b44d083eeee5583adfe642081a827224fa1309.tar.xz ice-99b44d083eeee5583adfe642081a827224fa1309.zip | |
Fixed ICE-4927: fixed proxy encoding to marshal protocol/encoding version instead of encoding it in endpoints
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 2592c3ae55d..d3bf808d437 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -329,7 +329,7 @@ def run(tests, root = False): elif o == "--protocol": if a not in ( "ssl", "tcp"): usage() - if getDefaultMapping() == "cs" and a == "ssl": + if not root and getDefaultMapping() == "cs" and a == "ssl": if mono: print("SSL is not supported with mono") sys.exit(1) @@ -1455,6 +1455,7 @@ def getTestEnv(lang, testdir): addClasspath(os.path.join(javaDir, "IceStorm.jar"), env) addClasspath(os.path.join(javaDir, "IceGrid.jar"), env) addClasspath(os.path.join(javaDir, "IcePatch2.jar"), env) + addClasspath(os.path.join(javaDir), env) # # On Windows, C# assemblies are found thanks to the .exe.config files. |