diff options
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/Makefile.am | 3 | ||||
| -rwxr-xr-x | cpp/src/tests/quick_txtest | 2 | ||||
| -rw-r--r-- | cpp/src/tests/txtest.cpp | 15 |
3 files changed, 12 insertions, 8 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 0f562cec16..d8300f46d3 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -134,7 +134,7 @@ header_test_LDADD=$(lib_client) TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) QPID_DATA_DIR= BOOST_TEST_SHOW_PROGRESS=yes $(srcdir)/run_test -system_tests = client_test quick_perftest quick_topictest run_header_test +system_tests = client_test quick_perftest quick_topictest run_header_test quick_txtest TESTS += start_broker $(system_tests) python_tests stop_broker run_federation_tests run_acl_tests EXTRA_DIST += \ @@ -142,6 +142,7 @@ EXTRA_DIST += \ run-unit-tests start_broker python_tests stop_broker \ quick_topictest \ quick_perftest \ + quick_txtest \ topictest \ run_header_test \ header_test.py \ diff --git a/cpp/src/tests/quick_txtest b/cpp/src/tests/quick_txtest new file mode 100755 index 0000000000..56df55e705 --- /dev/null +++ b/cpp/src/tests/quick_txtest @@ -0,0 +1,2 @@ +#!/bin/sh +exec `dirname $0`/run_test ./txtest --queues 4 --tx-count 10 --quiet diff --git a/cpp/src/tests/txtest.cpp b/cpp/src/tests/txtest.cpp index a4ee32c38a..a569bdd648 100644 --- a/cpp/src/tests/txtest.cpp +++ b/cpp/src/tests/txtest.cpp @@ -51,11 +51,12 @@ struct Args : public qpid::TestOptions { uint txCount; uint totalMsgCount; bool dtx; + bool quiet; Args() : init(true), transfer(true), check(true), size(256), durable(true), queues(2), base("tx-test"), msgsPerTx(1), txCount(1), totalMsgCount(10), - dtx(false) + dtx(false), quiet(false) { addOptions() @@ -69,7 +70,8 @@ struct Args : public qpid::TestOptions { ("messages-per-tx", optValue(msgsPerTx, "N"), "number of messages transferred per transaction") ("tx-count", optValue(txCount, "N"), "number of transactions per 'agent'") ("total-messages", optValue(totalMsgCount, "N"), "total number of messages in 'circulation'") - ("dtx", optValue(dtx, "yes|no"), "use distributed transactions"); + ("dtx", optValue(dtx, "yes|no"), "use distributed transactions") + ("quiet", optValue(quiet), "reduce output from test"); } }; @@ -159,7 +161,6 @@ struct Transfer : public Client, public Runnable session.messageTransfer(arg::content=out, arg::acceptMode=1); } sub.accept(sub.getUnaccepted()); - session.sendCompletion(); if (opts.dtx) { session.dtxEnd(arg::xid=xid); session.dtxPrepare(arg::xid=xid); @@ -219,7 +220,7 @@ struct Controller : public Client StringSet::iterator next = i + 1; if (next == queues.end()) next = queues.begin(); - std::cout << "Transfering from " << *i << " to " << *next << std::endl; + if (!opts.quiet) std::cout << "Transfering from " << *i << " to " << *next << std::endl; agents.push_back(new Transfer(*i, *next)); agents.back().thread = Thread(agents.back()); } @@ -241,13 +242,13 @@ struct Controller : public Client xidArr.collect(inDoubtXids); if (inDoubtXids.size()) { - std::cout << "Recovering DTX in-doubt transaction(s):" << std::endl; + if (!opts.quiet) std::cout << "Recovering DTX in-doubt transaction(s):" << std::endl; framing::StructHelper decoder; framing::Xid xid; // abort even, commit odd transactions for (unsigned i = 0; i < inDoubtXids.size(); i++) { decoder.decode(xid, inDoubtXids[i]); - std::cout << (i%2 ? " * aborting " : " * committing "); + if (!opts.quiet) std::cout << (i%2 ? " * aborting " : " * committing "); xid.print(std::cout); std::cout << std::endl; if (i%2) { @@ -276,7 +277,7 @@ struct Controller : public Client drained.push_back(m.getMessageProperties().getCorrelationId()); ++count; } - std::cout << "Drained " << count << " messages from " << *i << std::endl; + if (!opts.quiet) std::cout << "Drained " << count << " messages from " << *i << std::endl; } sort(ids.begin(), ids.end()); |