1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index 8fa4e315826..b0a0776d39e 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -2149,6 +2149,8 @@ def runTestsWithPath(path):
 def runTests(mappings=None, drivers=None):
     if not mappings:
         mappings = Mapping.getAll()
+    else:
+        mappings = list(set([m.getClientMapping() for m in mappings] + [m.getServerMapping() for m in mappings]))
     if not drivers:
         drivers = Driver.getAll()
 
@@ -2195,12 +2197,7 @@ def runTests(mappings=None, drivers=None):
         #
         configs = {}
         for mapping in mappings:
-            configs[mapping] = mapping.createConfig(opts)
-
-        if len(opts) > 0:
-            print(sys.argv[0] + ": unknown options {0}".format(opts))
-            usage()
-            sys.exit(1)
+            configs[mapping] = mapping.createConfig(opts[:])
 
         #
         # Provide the configurations to the driver and load the test suites for each mapping.