1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py
index 8a6e4915c4b..71f8d4a4791 100644
--- a/scripts/LocalDriver.py
+++ b/scripts/LocalDriver.py
@@ -458,15 +458,16 @@ class LocalDriver(Driver):
             if self.allCross and cross == current.testcase.getMapping():
                 continue
 
-            # If the given mapping doesn't support server-side, skip this mapping.
-            if cross and cross != cross.getServerMapping():
-                continue
-
-            # Skip if the mapping doesn't provide the test case.
+            # Skip if the mapping doesn't provide the test case
             server = current.testcase.getServerTestCase(cross)
             if not server:
                 continue
 
+            if cross and server.getMapping() != cross:
+                if not self.allCross:
+                    current.writeln("skipped, no server available for `{0}' mapping".format(cross))
+                continue
+
             current.writeln("[ running {0} test ]".format(current.testcase))
             if not self.all:
                 current.config = current.config.cloneRunnable(current)