diff options
Diffstat (limited to 'cpp/test/IceSSL/configuration/run.py')
-rwxr-xr-x | cpp/test/IceSSL/configuration/run.py | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py index 5b3ec087ec6..7995139ca8c 100755 --- a/cpp/test/IceSSL/configuration/run.py +++ b/cpp/test/IceSSL/configuration/run.py @@ -20,25 +20,8 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil -if TestUtil.protocol != "ssl": - print "This test may only be run with SSL enabled." - sys.exit(0) - name = os.path.join("IceSSL", "configuration") -testdir = os.path.join(toplevel, "test", name) - -client = os.path.join(testdir, "configuration") - -localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost -print "starting configuration...", -clientPipe = os.popen(client + localClientOptions + " 2>&1") -print "ok" - -TestUtil.printOutputFromPipe(clientPipe) - -clientStatus = TestUtil.closePipe(clientPipe) - -if clientStatus: - sys.exit(1) +testdir = os.path.join(toplevel, "test", name) +TestUtil.clientServerTestWithOptions(name, "", " " + testdir) sys.exit(0) |