diff options
| author | Alan Conway <aconway@apache.org> | 2008-11-26 17:37:16 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-11-26 17:37:16 +0000 |
| commit | 43e26ecb7cdb04cf7a9c7e87fa7902b7ebe3f5ce (patch) | |
| tree | 604fadb84ec6df689ca25b7e4ae7f2edf78f71b8 /cpp/src/tests | |
| parent | 300063322dd80c0dee30475de494afdb6a846d6a (diff) | |
| download | qpid-python-43e26ecb7cdb04cf7a9c7e87fa7902b7ebe3f5ce.tar.gz | |
Cluster.cpp: Fixed last-node-standing logic, better logging.
Shlib.cpp: added file name to errors messages.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@720924 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/Makefile.am | 4 | ||||
| -rw-r--r-- | cpp/src/tests/cluster_test.cpp | 1 | ||||
| -rwxr-xr-x | cpp/src/tests/perfdist | 8 |
3 files changed, 9 insertions, 4 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 78aadf0da0..0883ea1ea7 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -197,6 +197,10 @@ libdlclose_noop_la_SOURCES = dlclose_noop.c CLEANFILES+=valgrind.out *.log *.vglog* dummy_test $(unit_wrappers) +check_PROGRAMS+=tsxtest +tsxtest_SOURCES=tsxtest.cpp +tsxtest_LDADD=$(lib_client) + # FIXME aconway 2008-05-23: Disabled interop_runner because it uses # the obsolete Channel class. Convert to Session and re-enable. # diff --git a/cpp/src/tests/cluster_test.cpp b/cpp/src/tests/cluster_test.cpp index 862860693e..f4a38ae861 100644 --- a/cpp/src/tests/cluster_test.cpp +++ b/cpp/src/tests/cluster_test.cpp @@ -120,6 +120,7 @@ void ClusterFixture::add() { std::string prefix = os.str(); const char* argv[] = { "qpidd " __FILE__ , + "--no-module-dir", "--load-module=../.libs/cluster.so", "--cluster-name", name.c_str(), "--auth=no", "--no-data-dir", diff --git a/cpp/src/tests/perfdist b/cpp/src/tests/perfdist index 4edd9fa6ad..afbee99cd9 100755 --- a/cpp/src/tests/perfdist +++ b/cpp/src/tests/perfdist @@ -10,10 +10,10 @@ cat <<EOF usage: $0 <perftest-args> -- <client-hosts ...> [ --- <broker hosts...> ] Client & broker hosts can also be set in env vars CLIENTS and BROKERS. -Run perftest with clients running on the clients and brokers running -on the specified hosts. Clients are assigned to client hosts round -robin: publishers first, then subscribers. If there are multiple -brokers (for cluster tests) clients connect to them round robin. +Run perftest clients on the client hosts against brokers on the broker +hosts Clients are assigned to client hosts round robin: publishers +first, then subscribers. If there are multiple brokers (for cluster +tests) clients connect to them round robin. Broker hosts can be listed with -b in perftest-args or after --- at the end of the arguments. |