summaryrefslogtreecommitdiff
path: root/scripts/LocalDriver.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-11-28 10:22:27 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-11-28 10:22:27 +0100
commitd9da966392bc70215e1b84f3a90e0cee993cdf4d (patch)
treea689f0249bcf0ad0963e8d5f06863b38c83bc53a /scripts/LocalDriver.py
parentFixed test failure with java-compat tests (diff)
downloadice-d9da966392bc70215e1b84f3a90e0cee993cdf4d.tar.bz2
ice-d9da966392bc70215e1b84f3a90e0cee993cdf4d.tar.xz
ice-d9da966392bc70215e1b84f3a90e0cee993cdf4d.zip
Fixed PHP to lookup module in lib directory, fixed IceSSL config to only set VerifyPeer=0 for JavaScript clients
Diffstat (limited to 'scripts/LocalDriver.py')
-rw-r--r--scripts/LocalDriver.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py
index 1f12bb21bc6..6dc18ba369a 100644
--- a/scripts/LocalDriver.py
+++ b/scripts/LocalDriver.py
@@ -224,7 +224,8 @@ class RemoteTestCaseRunner(TestCaseRunner):
import Test
current.serverTestCase = self.serverController.runTestCase(str(testcase.getMapping()),
testcase.getTestSuite().getId(),
- testcase.getName())
+ testcase.getName(),
+ str(current.driver.cross))
try:
try:
current.host = current.serverTestCase.startServerSide(self.getConfig(current))
@@ -259,9 +260,10 @@ class RemoteTestCaseRunner(TestCaseRunner):
clientTestCase = self.clientController.runTestCase(str(testcase.getMapping()),
testcase.getTestSuite().getId(),
- testcase.getName())
+ testcase.getName(),
+ str(current.driver.cross))
try:
- current.result.write(clientTestCase.runClientSide(self.getConfig(current)))
+ current.result.write(clientTestCase.runClientSide(current.host, self.getConfig(current)))
except Test.Common.TestCaseFailedException as ex:
current.result.writeln(ex.output)
raise RuntimeError("test failed")