summaryrefslogtreecommitdiff
path: root/scripts/LocalDriver.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-12-07 19:14:37 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-12-07 19:14:37 +0100
commit69a8c690eacf555dd468deb9ecd1675705947324 (patch)
tree21a20d1abe57e93ceb9f9d7c9c2c5946a2fd4415 /scripts/LocalDriver.py
parentFixed Java IceSSL/configuration test failure when ran with --protocol=ssl (diff)
downloadice-69a8c690eacf555dd468deb9ecd1675705947324.tar.bz2
ice-69a8c690eacf555dd468deb9ecd1675705947324.tar.xz
ice-69a8c690eacf555dd468deb9ecd1675705947324.zip
Fixed test scripts to allow running JS tests even when --protocol is set
Diffstat (limited to 'scripts/LocalDriver.py')
-rw-r--r--scripts/LocalDriver.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py
index d1fd80e1f8f..e4bce8a1e20 100644
--- a/scripts/LocalDriver.py
+++ b/scripts/LocalDriver.py
@@ -463,13 +463,14 @@ class LocalDriver(Driver):
continue
current.writeln("[ running {0} test ]".format(current.testcase))
+ if not self.all:
+ current.config = current.config.cloneRunnable(current)
confStr = str(current.config)
if confStr:
current.writeln("- Config: {0}".format(confStr))
if cross:
current.writeln("- Mappings: {0}/{1}".format(client.getMapping(), server.getMapping()))
-
- if not current.config.canRun(current):
+ if self.all and not current.config.canRun(current):
current.writeln("skipped, not supported with this configuration")
return
@@ -485,12 +486,15 @@ class LocalDriver(Driver):
if not self.cross and not self.allCross:
if not current.testcase.getParent():
current.writeln("[ running {0} test ]".format(current.testcase))
+ if not self.all:
+ current.config = current.config.cloneRunnable(current)
confStr = str(current.config)
if confStr:
current.writeln("- Config: {0}".format(confStr))
- if not current.config.canRun(current):
+ if self.all and not current.config.canRun(current):
current.writeln("skipped, not supported with this configuration")
return
+
current.testcase._runClientSide(current)
def isWorkerThread(self):