diff options
| author | Eddie Louie <eddie.louie@mongodb.com> | 2017-03-25 16:44:22 -0400 |
|---|---|---|
| committer | Eddie Louie <eddie.louie@mongodb.com> | 2017-03-27 14:33:21 -0400 |
| commit | 422a7e6dddf42d09b7b9037f67d0da16de7c5968 (patch) | |
| tree | 47da094f47ea8ec4b31c13ae41f0bb41252ff7bc /buildscripts | |
| parent | 09a540b1b6912f1805aabf5ecd552d225d3bd1ec (diff) | |
| download | mongo-422a7e6dddf42d09b7b9037f67d0da16de7c5968.tar.gz | |
SERVER-27770 Remove other references to EXCLUDE_WITH_ALL_TAGS and
INCLUDE_WITH_ALL_TAGS
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/resmokelib/config.py | 7 | ||||
| -rw-r--r-- | buildscripts/resmokelib/parser.py | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/buildscripts/resmokelib/config.py b/buildscripts/resmokelib/config.py index a035d068c59..a3e207f8e2b 100644 --- a/buildscripts/resmokelib/config.py +++ b/buildscripts/resmokelib/config.py @@ -86,19 +86,12 @@ DBTEST_EXECUTABLE = None # actually running them). DRY_RUN = None -# If set, then any jstests that have all of the specified tags will be excluded from the suite(s). -EXCLUDE_WITH_ALL_TAGS = None - # If set, then any jstests that have any of the specified tags will be excluded from the suite(s). EXCLUDE_WITH_ANY_TAGS = None # If true, then a test failure or error will cause resmoke.py to exit and not run any more tests. FAIL_FAST = None -# If set, then only jstests that have all of the specified tags will be run during the jstest -# portion of the suite(s). -INCLUDE_WITH_ALL_TAGS = None - # If set, then only jstests that have at least one of the specified tags will be run during the # jstest portion of the suite(s). INCLUDE_WITH_ANY_TAGS = None diff --git a/buildscripts/resmokelib/parser.py b/buildscripts/resmokelib/parser.py index 7181b1beeaa..8b53ab12a63 100644 --- a/buildscripts/resmokelib/parser.py +++ b/buildscripts/resmokelib/parser.py @@ -302,9 +302,7 @@ def get_suites(values, args): # Do not change the execution order of the jstests passed as args, unless a tag option is # specified. If an option is specified, then sort the tests for consistent execution order. _config.ORDER_TESTS_BY_NAME = any(tag_filter is not None for - tag_filter in (_config.EXCLUDE_WITH_ALL_TAGS, - _config.EXCLUDE_WITH_ANY_TAGS, - _config.INCLUDE_WITH_ALL_TAGS, + tag_filter in (_config.EXCLUDE_WITH_ANY_TAGS, _config.INCLUDE_WITH_ANY_TAGS)) # No specified config, just use the following, and default the logging and executor. suite_config = _make_jstests_config(args) |