Merge remote-tracking branch 'origin/3.6'

1 files changed, 11 insertions, 1 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index c74851ebc37..a4cdb62a57b 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -661,8 +661,18 @@ def run(tests, root = False):
             # js test user server for other language so we can ignore this
             if lang == "js":
                 continue
+
+            # Run each crossLang through the remove filters. Does not support filter.
+            # We do this so that we can filter out cross language tests if necessary.
+            def langFiltered(lang):
+                for testFilter, removeFilter in filters:
+                    if removeFilter and testFilter.search(lang):
+                        return True
+                return False
+
             # This is all other languages than the current mapping.
-            crossLang = [ l for l in cross if lang != l ]
+            crossLang = [ l for l in cross if lang != l and langFiltered(l) == False]
+
             # This is all eligible cross tests for the current mapping.
             # Now expand out the tests. We run only tcp for most cross tests.
             for c in crossLang: