Support for C++ iOS Simulator controller

1 files changed, 11 insertions, 7 deletions

diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py
index 1f128ce11a1..5dd0aec5ac2 100644
--- a/scripts/LocalDriver.py
+++ b/scripts/LocalDriver.py
@@ -316,11 +316,15 @@ class LocalDriver(Driver):
         self.results = []
         self.threadlocal = threading.local()
 
-        if self.clientCtlPrx or self.serverCtlPrx:
-            self.initCommunicator()
-            self.runner = RemoteTestCaseRunner(self.communicator, self.clientCtlPrx, self.serverCtlPrx)
-        else:
-            self.runner = TestCaseRunner()
+        try:
+            if self.clientCtlPrx or self.serverCtlPrx:
+                self.initCommunicator()
+                self.runner = RemoteTestCaseRunner(self.communicator, self.clientCtlPrx, self.serverCtlPrx)
+            else:
+                self.runner = TestCaseRunner()
+        except:
+            self.destroy()
+            raise
 
     def run(self, mappings, testSuiteIds):
 
@@ -445,7 +449,7 @@ class LocalDriver(Driver):
                 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 not current.config.canRun(current) or not current.testcase.canRun(current):
                 current.writeln("skipped, not supported with this configuration")
                 return
 
@@ -466,7 +470,7 @@ class LocalDriver(Driver):
                 confStr = str(current.config)
                 if confStr:
                     current.writeln("- Config: {0}".format(confStr))
-                if not current.config.canRun(current):
+                if not current.config.canRun(current) or not current.testcase.canRun(current):
                     current.writeln("skipped, not supported with this configuration")
                     return