Merge branch 'develop' into json-dump

3 files changed, 20 insertions, 3 deletions

diff --git a/test/format/smoke.sh b/test/format/smoke.sh
index c64d738999d..62577692d0c 100755
--- a/test/format/smoke.sh
+++ b/test/format/smoke.sh
@@ -1,4 +1,9 @@
 #! /bin/sh
 
 # Smoke-test format as part of running "make check".
-./t -1 -c "." data_source=table file_type=row ops=100000 rows=10000 threads=4
+args="-1 -c "." data_source=table ops=100000 rows=10000 threads=4"
+
+./t $args file_type=fix || exit 1
+./t $args file_type=row || exit 1
+./t $args file_type=row data_source=lsm || exit 1
+./t $args file_type=var || exit 1
diff --git a/test/thread/Makefile.am b/test/thread/Makefile.am
index 44336dda4ba..4fe0f012e29 100644
--- a/test/thread/Makefile.am
+++ b/test/thread/Makefile.am
@@ -5,7 +5,7 @@ t_LDADD = $(top_builddir)/libwiredtiger.la
 t_SOURCES = thread.h file.c rw.c stats.c t.c
 t_LDFLAGS = -static
 
-TESTS = $(noinst_PROGRAMS)
+TESTS = smoke.sh
 
 clean-local:
-	rm -rf WiredTiger* __* *.core
+	rm -rf WiredTiger* wt.* *.core __stats
diff --git a/test/thread/smoke.sh b/test/thread/smoke.sh
new file mode 100755
index 00000000000..955dab5acad
--- /dev/null
+++ b/test/thread/smoke.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+# Smoke-test format as part of running "make check".
+
+./t -t f || exit 1
+./t -S -F -t f || exit 1
+
+./t -t r || exit 1
+./t -S -F -t r || exit 1
+
+./t -t v || exit 1
+./t -S -F -t v || exit 1