7 files changed, 25 insertions, 5 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 265e2c3858..13de836d2c 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -53,7 +53,7 @@ perftest_LDADD=$(lib_client)
 # NB: CppUnit test libraries below will be migrated to boost test programs.
 #
 
-# Unit tests
+# cppunit tests
 broker_unit_tests =	\
   AccumulatedAckTest	\
   DtxWorkRecordTest     \
@@ -144,9 +144,6 @@ gen.mk: Makefile.am
 	> $@-t
 	mv $@-t $@
 
-check-unit:
-	$(MAKE) check TESTS=$(UNIT_TESTS) run-unit-tests
-
 CLEANFILES+=valgrind.out *.log *.vglog dummy_test $(unit_wrappers)
 MAINTAINERCLEANFILES=gen.mk
 
@@ -161,3 +158,10 @@ interop_runner_SOURCES = 	\
   TestCase.h			\
   TestOptions.h
 interop_runner_LDADD = $(lib_client) $(lib_common) $(extra_libs)
+
+# Longer running stability tests, not run by default check: target.
+# Not run under valgrind, too slow
+LONG_TESTS=fanout_perftest shared_perftest multiq_perftest topic_perftest
+EXTRA_DIST+=$(LONG_TESTS) run_perftest
+check-long:
+	$(MAKE) check TESTS="start_broker $(LONG_TESTS) stop_broker" VALGRIND=
diff --git a/cpp/src/tests/fanout_perftest b/cpp/src/tests/fanout_perftest
new file mode 100755
index 0000000000..602aac25b7
--- /dev/null
+++ b/cpp/src/tests/fanout_perftest
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec `dirname $0`/run_perftest 10000 --mode fanout --npubs 16 --nsubs 16 
diff --git a/cpp/src/tests/multiq_perftest b/cpp/src/tests/multiq_perftest
new file mode 100755
index 0000000000..f6644e740c
--- /dev/null
+++ b/cpp/src/tests/multiq_perftest
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec `dirname $0`/run_perftest 10000  --mode shared --qt 16
diff --git a/cpp/src/tests/quick_perftest b/cpp/src/tests/quick_perftest
index 9108d58a71..5522b7fee4 100755
--- a/cpp/src/tests/quick_perftest
+++ b/cpp/src/tests/quick_perftest
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec `dirname $0`/run_test ./perftest --count 1000
+exec `dirname $0`/run_test ./perftest --summary --count 1000
diff --git a/cpp/src/tests/run_perftest b/cpp/src/tests/run_perftest
new file mode 100755
index 0000000000..c1e66294c1
--- /dev/null
+++ b/cpp/src/tests/run_perftest
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Args: count [perftest options...]
+# Run a perftest with count multiplied.
+# 
+MULTIPLIER=3
+COUNT=`expr $1 \* $MULTIPLIER`
+shift
+exec `dirname $0`/run_test ./perftest --summary --count $COUNT "$@"
diff --git a/cpp/src/tests/shared_perftest b/cpp/src/tests/shared_perftest
new file mode 100755
index 0000000000..212ba22df4
--- /dev/null
+++ b/cpp/src/tests/shared_perftest
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec `dirname $0`/run_perftest 100000 --mode shared  --npubs 16 --nsubs 16
diff --git a/cpp/src/tests/topic_perftest b/cpp/src/tests/topic_perftest
new file mode 100755
index 0000000000..5d317610f3
--- /dev/null
+++ b/cpp/src/tests/topic_perftest
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec `dirname $0`/run_perftest 10000 --mode topic --qt 16