Author: kpvdr Date: 2009-11-09 10:06:39 -0500 (Mon, 09 Nov 2009) New Revision: 3703 Modified: store/trunk/cpp/Makefile.am store/trunk/cpp/lib/MessageStoreImpl.cpp store/trunk/cpp/tests/Makefile.am store/trunk/cpp/tests/SimpleTest.cpp store/trunk/cpp/tests/TransactionalTest.cpp Log: Minor corrections and additions to store makefiles and tests Modified: store/trunk/cpp/Makefile.am =================================================================== --- store/trunk/cpp/Makefile.am 2009-11-09 15:05:16 UTC (rev 3702) +++ store/trunk/cpp/Makefile.am 2009-11-09 15:06:39 UTC (rev 3703) @@ -56,9 +56,9 @@ @echo "WARNING: rpmlint not found, could not validate RPMs." endif -check-long: +check-long: all $(MAKE) -C tests check-long -check-short: +check-short: all $(MAKE) -C tests check-short Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-11-09 15:05:16 UTC (rev 3702) +++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-11-09 15:06:39 UTC (rev 3703) @@ -288,7 +288,7 @@ else init(); - QPID_LOG(notice, "Store module initialized; dir=" << dir); + QPID_LOG(notice, "Store module initialized; store-dir=" << dir); QPID_LOG(info, "> Default files per journal: " << jfiles); // TODO: Uncomment these lines when auto-expand is enabled. // QPID_LOG(info, "> Auto-expand " << (autoJrnlExpand ? "enabled" : "disabled")); Modified: store/trunk/cpp/tests/Makefile.am =================================================================== --- store/trunk/cpp/tests/Makefile.am 2009-11-09 15:05:16 UTC (rev 3702) +++ store/trunk/cpp/tests/Makefile.am 2009-11-09 15:06:39 UTC (rev 3703) @@ -43,11 +43,11 @@ system_test.sh \ clean.sh -LONG_TESTS = \ - run_long_python_tests \ +LONG_TESTS = \ + run_long_python_tests \ clean.sh -SHORT_TESTS = \ +SHORT_TESTS = \ SimpleTest \ TransactionalTest \ system_test.sh \ @@ -99,13 +99,13 @@ $(srcdir)/run_test # Note: Auto-recursion is not supported for custom targets, so add a ${MAKE} -C for each dir in the SUBDIRS list above. -check-long: +check-long: all $(MAKE) -C jrnl check-long if DO_CLUSTER_TESTS $(MAKE) -C cluster check-long endif $(MAKE) check TESTS="$(LONG_TESTS)" SUBDIRS=. -check-short: +check-short: all $(MAKE) check TESTS="$(SHORT_TESTS)" SUBDIRS=. \ No newline at end of file Modified: store/trunk/cpp/tests/SimpleTest.cpp =================================================================== --- store/trunk/cpp/tests/SimpleTest.cpp 2009-11-09 15:05:16 UTC (rev 3702) +++ store/trunk/cpp/tests/SimpleTest.cpp 2009-11-09 15:06:39 UTC (rev 3703) @@ -112,6 +112,10 @@ Exchange::shared_ptr exchange = exchanges.get(exchangeName); Queue::shared_ptr queue = queues.find(queueName); + // check exchange args are still set + for (FieldTable::ValueMap::const_iterator i = args.begin(); i!=args.end(); i++) { + BOOST_CHECK(exchange->getArgs().get((*i).first)->getData() == (*i).second->getData()); + } //check it is bound by unbinding BOOST_REQUIRE(exchange->unbind(queue, key, &args)); store.unbind(*exchange, *queue, key, args); @@ -127,6 +131,10 @@ Exchange::shared_ptr exchange = exchanges.get(exchangeName); Queue::shared_ptr queue = queues.find(queueName); + // check exchange args are still set + for (FieldTable::ValueMap::const_iterator i = args.begin(); i!=args.end(); i++) { + BOOST_CHECK(exchange->getArgs().get((*i).first)->getData() == (*i).second->getData()); + } //make sure it is no longer bound BOOST_REQUIRE(!exchange->unbind(queue, key, &args)); } Modified: store/trunk/cpp/tests/TransactionalTest.cpp =================================================================== --- store/trunk/cpp/tests/TransactionalTest.cpp 2009-11-09 15:05:16 UTC (rev 3702) +++ store/trunk/cpp/tests/TransactionalTest.cpp 2009-11-09 15:06:39 UTC (rev 3703) @@ -266,7 +266,7 @@ QPID_AUTO_TEST_CASE(MultiQueueAbort) { cout << test_filename << ".MultiQueueAbort: " << flush; - testMultiQueueTxn(2, true, true); + testMultiQueueTxn(2, true, false); cout << "ok" << endl; }