diff options
| author | Jason Carey <jcarey@argv.me> | 2016-03-29 15:07:43 -0400 |
|---|---|---|
| committer | Jason Carey <jcarey@argv.me> | 2016-03-29 15:59:52 -0400 |
| commit | 42930d4ffc88527489f8c60c80a0d57bb95519e5 (patch) | |
| tree | c19953bdd177d81570ced67d6639f0883c5725b9 | |
| parent | 6bd6589e806c6545906475510e1b385774676489 (diff) | |
| download | mongo-42930d4ffc88527489f8c60c80a0d57bb95519e5.tar.gz | |
SERVER-23400 tag and skip mmapv1 tests on s390x
| -rw-r--r-- | etc/evergreen.yml | 2 | ||||
| -rw-r--r-- | jstests/core/apitest_db.js | 3 | ||||
| -rw-r--r-- | jstests/noPassthrough/read_only_command_line.js | 3 | ||||
| -rw-r--r-- | jstests/replsets/config_server_checks.js | 3 |
4 files changed, 10 insertions, 1 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index aa24e2e1f87..ad1a44e6d03 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -4509,7 +4509,7 @@ buildvariants: tooltags: -gccgoflags "$(pkg-config --libs --cflags libssl libsasl2)" -tags 'sasl ssl' compile_flags: --ssl MONGO_DISTMOD=rhel72 --release -j3 CCFLAGS="-march=z196 -mtune=zEC12" CXX=/opt/mongodbtoolchain/v1/bin/g++ CC=/opt/mongodbtoolchain/v1/bin/gcc num_jobs_available: 2 - test_flags: --continueOnFailure + test_flags: --continueOnFailure --excludeWithAnyTags=requires_mmapv1 # has_packages: true packager_script: packager-enterprise.py packager_arch: s390x diff --git a/jstests/core/apitest_db.js b/jstests/core/apitest_db.js index 688baa8dd4f..6018835e7f2 100644 --- a/jstests/core/apitest_db.js +++ b/jstests/core/apitest_db.js @@ -1,5 +1,8 @@ /** * Tests for the db object enhancement + * + * This test requires mmapv1. + * @tags: [requires_mmapv1] */ assert("test" == db, "wrong database currently not test"); diff --git a/jstests/noPassthrough/read_only_command_line.js b/jstests/noPassthrough/read_only_command_line.js index 7e803ea49be..1c88a61c50b 100644 --- a/jstests/noPassthrough/read_only_command_line.js +++ b/jstests/noPassthrough/read_only_command_line.js @@ -1,5 +1,8 @@ // Test that setting readOnly mode on the command line causes readOnly to be properly set in both // isMaster and serverStatus output. +// +// This test requires mmapv1. +// @tags: [requires_mmapv1] (function() { "use strict"; diff --git a/jstests/replsets/config_server_checks.js b/jstests/replsets/config_server_checks.js index 66d30535677..c88ccf6815b 100644 --- a/jstests/replsets/config_server_checks.js +++ b/jstests/replsets/config_server_checks.js @@ -1,6 +1,9 @@ /* * Tests various combinations of the configsvr field in replica set configurations and the * command line options that control whether a node can function as a member of a CSRS. + * + * This test requires mmapv1. + * @tags: [requires_mmapv1] */ function expectState(rst, state) { |