Update upstream source from tag 'upstream/6.0.10'debian/6.0.10-1

Update to upstream version '6.0.10'
with Debian dir 2d176fa254eee97b139f712fec5709641335a8c3

1 files changed, 21 insertions, 15 deletions

diff --git a/jstests/selinux/core.js b/jstests/selinux/core.js
index cc12e46c122..216420edf2a 100644
--- a/jstests/selinux/core.js
+++ b/jstests/selinux/core.js
@@ -4,20 +4,6 @@
 load('jstests/selinux/lib/selinux_base_test.js');
 
 class TestDefinition extends SelinuxBaseTest {
-    get config() {
-        return {
-            "systemLog":
-                {"destination": "file", "logAppend": true, "path": "/var/log/mongodb/mongod.log"},
-            "storage": {"dbPath": "/var/lib/mongo", "journal": {"enabled": true}},
-            "processManagement": {
-                "fork": true,
-                "pidFilePath": "/var/run/mongodb/mongod.pid",
-                "timeZoneInfo": "/usr/share/zoneinfo"
-            },
-            "net": {"port": 27017, "bindIp": "127.0.0.1"}
-        };
-    }
-
     run() {
         // On RHEL7 there is no python3, but check_has_tag.py will also work with python2
         const python = (0 == runNonMongoProgram("which", "python3")) ? "python3" : "python2";
@@ -40,11 +26,31 @@ class TestDefinition extends SelinuxBaseTest {
                     runNonMongoProgram(python,
                                        "buildscripts/resmokelib/utils/check_has_tag.py",
                                        t,
-                                       "no_selinux")) {
+                                       "^no_selinux$")) {
                     jsTest.log("Skipping test due to no_selinux tag: " + t);
                     continue;
                 }
 
+                // Tests relying on featureFlagXXX will not work
+                if (HAS_TAG ==
+                    runNonMongoProgram(python,
+                                       "buildscripts/resmokelib/utils/check_has_tag.py",
+                                       t,
+                                       "^featureFlag.+$")) {
+                    jsTest.log("Skipping test due to feature flag tag: " + t);
+                    continue;
+                }
+
+                // Tests relying on featureFlagXXX will not work
+                if (HAS_TAG ==
+                    runNonMongoProgram(python,
+                                       "buildscripts/resmokelib/utils/check_has_tag.py",
+                                       t,
+                                       "^featureFlag.+$")) {
+                    jsTest.log("Skipping test due to feature flag tag: " + t);
+                    continue;
+                }
+
                 jsTest.log("Running test: " + t);
                 if (!load(t)) {
                     throw ("failed to load test " + t);