Author: aconway
Date: Fri Jan 4 07:42:34 2008
New Revision: 608892
URL: http://svn.apache.org/viewvc?rev=608892&view=rev
Log:
Makefile.am: added check-long target to run perftest scenarios.
Not run as part of normal check target.
Takes about 5 minutes to run on an amd-32 optimized build.
For a longer run, increase PERFTEST_MULT in run_perftest.
Added:
incubator/qpid/trunk/qpid/cpp/src/tests/fanout_perftest (with props)
incubator/qpid/trunk/qpid/cpp/src/tests/multiq_perftest (with props)
incubator/qpid/trunk/qpid/cpp/src/tests/run_perftest (with props)
incubator/qpid/trunk/qpid/cpp/src/tests/shared_perftest (with props)
incubator/qpid/trunk/qpid/cpp/src/tests/topic_perftest (with props)
Modified:
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/quick_perftest
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=608892&r1=608891&r2=608892&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Fri Jan 4 07:42:34 2008
@@ -53,7 +53,7 @@
# 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 @@
> [EMAIL PROTECTED]
mv [EMAIL PROTECTED] $@
-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 @@
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=
Added: incubator/qpid/trunk/qpid/cpp/src/tests/fanout_perftest
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/fanout_perftest?rev=608892&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/fanout_perftest (added)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/fanout_perftest Fri Jan 4 07:42:34
2008
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec `dirname $0`/run_perftest 10000 --mode fanout --npubs 16 --nsubs 16
Propchange: incubator/qpid/trunk/qpid/cpp/src/tests/fanout_perftest
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/trunk/qpid/cpp/src/tests/multiq_perftest
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/multiq_perftest?rev=608892&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/multiq_perftest (added)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/multiq_perftest Fri Jan 4 07:42:34
2008
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec `dirname $0`/run_perftest 10000 --mode shared --qt 16
Propchange: incubator/qpid/trunk/qpid/cpp/src/tests/multiq_perftest
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/quick_perftest
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/quick_perftest?rev=608892&r1=608891&r2=608892&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/quick_perftest (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/quick_perftest Fri Jan 4 07:42:34
2008
@@ -1,2 +1,2 @@
#!/bin/sh
-exec `dirname $0`/run_test ./perftest --count 1000
+exec `dirname $0`/run_test ./perftest --summary --count 1000
Added: incubator/qpid/trunk/qpid/cpp/src/tests/run_perftest
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/run_perftest?rev=608892&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/run_perftest (added)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/run_perftest Fri Jan 4 07:42:34
2008
@@ -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 "$@"
Propchange: incubator/qpid/trunk/qpid/cpp/src/tests/run_perftest
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/trunk/qpid/cpp/src/tests/shared_perftest
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/shared_perftest?rev=608892&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/shared_perftest (added)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/shared_perftest Fri Jan 4 07:42:34
2008
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec `dirname $0`/run_perftest 100000 --mode shared --npubs 16 --nsubs 16
Propchange: incubator/qpid/trunk/qpid/cpp/src/tests/shared_perftest
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/trunk/qpid/cpp/src/tests/topic_perftest
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/topic_perftest?rev=608892&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/topic_perftest (added)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/topic_perftest Fri Jan 4 07:42:34
2008
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec `dirname $0`/run_perftest 10000 --mode topic --qt 16
Propchange: incubator/qpid/trunk/qpid/cpp/src/tests/topic_perftest
------------------------------------------------------------------------------
svn:executable = *
