diff options
| author | Alan Conway <aconway@apache.org> | 2008-02-06 22:49:10 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-02-06 22:49:10 +0000 |
| commit | 52faea872170225ac1a5441202ad7f35f88c3c77 (patch) | |
| tree | 29a46e1acd2436124da3e574209f3ef6f726ed0b /cpp/src/tests | |
| parent | 16b2214415090d952d6b8f57a34b03162e9e27b1 (diff) | |
| download | qpid-python-52faea872170225ac1a5441202ad7f35f88c3c77.tar.gz | |
From Ted Ross, https://issues.apache.org/jira/browse/QPID-780
Implementation of --data-dir for qpidd.
Additions by myself:
- set QPID_DATA_DIR= in test env so existing tests can run with no data dir.
- src/Makefile.am and qpidc.spec.in install /var/lib/qpidd directory.
NOTE: qpidd with no optoins will now FAIL if it cannot write /var/lib/qpidd.
Start it with --data-dir= or set QPID_DATA_DIR= in your environement to
run with no data directory.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@619200 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/BrokerFixture.h | 1 | ||||
| -rw-r--r-- | cpp/src/tests/Makefile.am | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/tests/BrokerFixture.h b/cpp/src/tests/BrokerFixture.h index 1a397c76c8..b4e4a2082b 100644 --- a/cpp/src/tests/BrokerFixture.h +++ b/cpp/src/tests/BrokerFixture.h @@ -46,6 +46,7 @@ struct BrokerFixture { // Management doesn't play well with multiple in-process brokers. opts.enableMgmt=false; opts.workerThreads=1; + opts.dataDir=""; broker = Broker::create(opts); // TODO aconway 2007-12-05: At one point BrokerFixture // tests could hang in Connection ctor if the following diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 3d152258a3..5d29f3d979 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -109,7 +109,7 @@ testprogs= \ check_PROGRAMS += $(testprogs) interop_runner -TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) $(srcdir)/run_test +TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) QPID_DATA_DIR= $(srcdir)/run_test system_tests = client_test quick_perftest quick_topictest TESTS += run-unit-tests start_broker $(system_tests) python_tests stop_broker |