diff options
| author | David Hows <howsdav@gmail.com> | 2016-09-28 11:34:46 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-09-28 11:34:46 +1000 |
| commit | 14339bb76144a3ceeff8bd51e3b8062b7c7bc33d (patch) | |
| tree | 5380c52226be78b95dbab235f1b74f6ed22b1bcf | |
| parent | 50bfdbcdcf807325be2f82ec041d2c36c8eeeea3 (diff) | |
| download | mongo-14339bb76144a3ceeff8bd51e3b8062b7c7bc33d.tar.gz | |
WT-2895 Reduce the runtime of make check testing with disable long (#3052)
Mostly in order to allow valgrind runs with make check to finish in a reasonable time.
| -rwxr-xr-x | test/checkpoint/smoke.sh | 3 | ||||
| -rw-r--r-- | test/csuite/wt2246_col_append/main.c | 2 | ||||
| -rw-r--r-- | test/csuite/wt2323_join_visibility/main.c | 2 | ||||
| -rw-r--r-- | test/csuite/wt2535_insert_race/main.c | 2 | ||||
| -rw-r--r-- | test/csuite/wt2834_join_bloom_fix/main.c | 2 |
5 files changed, 11 insertions, 0 deletions
diff --git a/test/checkpoint/smoke.sh b/test/checkpoint/smoke.sh index 2f1d4345ad7..123d4e00df5 100755 --- a/test/checkpoint/smoke.sh +++ b/test/checkpoint/smoke.sh @@ -6,6 +6,9 @@ set -e echo "checkpoint: 3 mixed tables" $TEST_WRAPPER ./t -T 3 -t m +# We are done if short tests are requested +test -z "$TESTUTIL_DISABLE_LONG_TESTS" || exit 0 + echo "checkpoint: 6 column-store tables" $TEST_WRAPPER ./t -T 6 -t c diff --git a/test/csuite/wt2246_col_append/main.c b/test/csuite/wt2246_col_append/main.c index b795816c76f..1da8732abb4 100644 --- a/test/csuite/wt2246_col_append/main.c +++ b/test/csuite/wt2246_col_append/main.c @@ -104,6 +104,8 @@ main(int argc, char *argv[]) char buf[100]; opts = &_opts; + if (testutil_disable_long_tests()) + return (0); memset(opts, 0, sizeof(*opts)); opts->table_type = TABLE_ROW; opts->n_append_threads = N_APPEND_THREADS; diff --git a/test/csuite/wt2323_join_visibility/main.c b/test/csuite/wt2323_join_visibility/main.c index bbf1626fe82..75aef530368 100644 --- a/test/csuite/wt2323_join_visibility/main.c +++ b/test/csuite/wt2323_join_visibility/main.c @@ -96,6 +96,8 @@ main(int argc, char *argv[]) opts = &_opts; sharedopts = &_sharedopts; + if (testutil_disable_long_tests()) + return (0); memset(opts, 0, sizeof(*opts)); memset(sharedopts, 0, sizeof(*sharedopts)); diff --git a/test/csuite/wt2535_insert_race/main.c b/test/csuite/wt2535_insert_race/main.c index 5eaca3279b6..ee567df8749 100644 --- a/test/csuite/wt2535_insert_race/main.c +++ b/test/csuite/wt2535_insert_race/main.c @@ -52,6 +52,8 @@ main(int argc, char *argv[]) int i; opts = &_opts; + if (testutil_disable_long_tests()) + return (0); memset(opts, 0, sizeof(*opts)); opts->nthreads = 10; opts->nrecords = 1000; diff --git a/test/csuite/wt2834_join_bloom_fix/main.c b/test/csuite/wt2834_join_bloom_fix/main.c index 1e2d919d3c7..0b21ba0607b 100644 --- a/test/csuite/wt2834_join_bloom_fix/main.c +++ b/test/csuite/wt2834_join_bloom_fix/main.c @@ -62,6 +62,8 @@ main(int argc, char *argv[]) char joinuri[256]; opts = &_opts; + if (testutil_disable_long_tests()) + return (0); memset(opts, 0, sizeof(*opts)); testutil_check(testutil_parse_opts(argc, argv, opts)); |