Import wiredtiger: 6a31c2118cce88c68281eda2ca9ab1df915a2773 from branch mongodb-3.4

ref: fc0e7abe82..6a31c2118c
for: 3.4.0

WT-2831       Skip creating a checkpoint if there have been no changes
WT-2858       rename wtperf's CONFIG structure
WT-2895       Reduce the runtime of make check testing with disable long
WT-2907       Bug in Java ConcurrentCloseTest case
WT-2917       split wtperf's configuration into per-database and per-run parts
WT-2920       New eviction statistics
WT-2931       Configure default in-memory dirty cache usage lower
WT-2932       Allow applications to selectively ignore cache limit with in-memory configuration
WT-2933       Fix a race between named snapshots and checkpoints
WT-2937       test_inmem01 aborts due to stuck cache
WT-2938       Assembly files should end in .sx, not .S
WT-2941       Improve test/format to use faster key-generation functions
WT-2942       verbose strings don't need newline
WT-2946       dist/s_docs incompatible with OS X Xcode installation
WT-2948       simplify error handling by making epoch time return never fail
WT-2950       Inserting multi-megabyte values can cause large in-memory pages

1 files changed, 3 insertions, 0 deletions

diff --git a/src/third_party/wiredtiger/test/checkpoint/smoke.sh b/src/third_party/wiredtiger/test/checkpoint/smoke.sh
index 2f1d4345ad7..123d4e00df5 100755
--- a/src/third_party/wiredtiger/test/checkpoint/smoke.sh
+++ b/src/third_party/wiredtiger/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