From 2ccd734741281b6bf9f9e7f5af6d3697f579ae14 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 15 Apr 2009 21:21:47 +0000 Subject: Clean up temporary data directories in tests. ForkedBroker.cpp: create/delete tmp data directory if passed arg TMP_DATA_DIR. failover_soak.cpp, PartialFailure.cpp: use tmp data dir feature of ForkedBroker git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@765365 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/failover_soak.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'cpp/src/tests/failover_soak.cpp') diff --git a/cpp/src/tests/failover_soak.cpp b/cpp/src/tests/failover_soak.cpp index 2da60f47b5..c8f67aadd8 100644 --- a/cpp/src/tests/failover_soak.cpp +++ b/cpp/src/tests/failover_soak.cpp @@ -326,21 +326,15 @@ startNewBroker ( brokerVector & brokers, static int brokerId = 0; stringstream path, prefix; prefix << "soak-" << brokerId; - string dataDir("/tmp/failover_soak.XXXXXX"); - if (!mkdtemp(const_cast(dataDir.c_str()))) - throw qpid::ErrnoException("Can't create data dir"); - std::vector argv = list_of ("qpidd") ("--cluster-name")(clusterName) ("--auth=no") - ("--data-dir")(dataDir) ("--mgmt-enable=no") - ("--log-prefix") - (prefix.str()) - ("--log-to-file") + ("--log-prefix")(prefix.str()) + ("--log-to-file")(prefix.str()+".log") ("--log-enable=error+") - (prefix.str()+".log"); + ("TMP_DATA_DIR"); if (endsWith(moduleOrDir, "cluster.so")) { // Module path specified, load only that module. @@ -355,7 +349,7 @@ startNewBroker ( brokerVector & brokers, argv.push_back(string("--module-dir=")+moduleOrDir); } - newbie = new ForkedBroker ( argv ); + newbie = new ForkedBroker (argv); newbie_port = newbie->getPort(); ForkedBroker * broker = newbie; -- cgit v1.2.1