From 3151b6ce503ffc877589422c5559647d363d5bf1 Mon Sep 17 00:00:00 2001 From: Logan Dethrow Date: Fri, 9 Sep 2011 15:22:11 -0400 Subject: Fixed llhttpclient_tut.cpp by initializing the LLCurl class during test setup. --- indra/test/llhttpclient_tut.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'indra/test/llhttpclient_tut.cpp') diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp index 03759001ae..c5e889b860 100644 --- a/indra/test/llhttpclient_tut.cpp +++ b/indra/test/llhttpclient_tut.cpp @@ -84,10 +84,9 @@ namespace tut public: HTTPClientTestData() { - apr_pool_create(&mPool, NULL); - mServerPump = new LLPumpIO(mPool); - mClientPump = new LLPumpIO(mPool); - + LLCurl::initClass(false); + mServerPump = new LLPumpIO(); + mClientPump = new LLPumpIO(); LLHTTPClient::setPump(*mClientPump); } @@ -95,12 +94,11 @@ namespace tut { delete mServerPump; delete mClientPump; - apr_pool_destroy(mPool); } void setupTheServer() { - LLHTTPNode& root = LLIOHTTPServer::create(mPool, *mServerPump, 8888); + LLHTTPNode& root = LLIOHTTPServer::create(*mServerPump, 8888); LLHTTPStandardServices::useServices(); LLHTTPRegistrar::buildAllServices(root); -- cgit v1.2.3 From 620b63a31667d93d9186217eb355d05e71ff245c Mon Sep 17 00:00:00 2001 From: Logan Dethrow Date: Thu, 20 Oct 2011 11:20:41 -0400 Subject: Fixed test build issues caused by merging. Still encountering pthread assert after running indra/test --- indra/test/llhttpclient_tut.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/test/llhttpclient_tut.cpp') diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp index c5e889b860..16a73c03cb 100644 --- a/indra/test/llhttpclient_tut.cpp +++ b/indra/test/llhttpclient_tut.cpp @@ -36,6 +36,7 @@ // These are too slow on Windows to actually include in the build. JC #if !LL_WINDOWS +#include "llapr.h" #include "lltut.h" #include "llhttpclient.h" #include "llformat.h" @@ -84,9 +85,10 @@ namespace tut public: HTTPClientTestData() { + apr_pool_create(&mPool, NULL); LLCurl::initClass(false); - mServerPump = new LLPumpIO(); - mClientPump = new LLPumpIO(); + mServerPump = new LLPumpIO(mPool); + mClientPump = new LLPumpIO(mPool); LLHTTPClient::setPump(*mClientPump); } @@ -98,7 +100,7 @@ namespace tut void setupTheServer() { - LLHTTPNode& root = LLIOHTTPServer::create(*mServerPump, 8888); + LLHTTPNode& root = LLIOHTTPServer::create(mPool, *mServerPump, 8888); LLHTTPStandardServices::useServices(); LLHTTPRegistrar::buildAllServices(root); -- cgit v1.2.3 From 182566800a834df8cb12fb03a869b216ad13cd84 Mon Sep 17 00:00:00 2001 From: Logan Dethrow Date: Fri, 18 Nov 2011 12:33:07 -0500 Subject: Re-added some missing calls to apr_pool_destroy() that I failed to readd after the thread local storage rollback. Also added a call to LLProxy::cleanupClass() to prevent indra/test from segfaulting on exit. --- indra/test/llhttpclient_tut.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/test/llhttpclient_tut.cpp') diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp index 16a73c03cb..4b4046632c 100644 --- a/indra/test/llhttpclient_tut.cpp +++ b/indra/test/llhttpclient_tut.cpp @@ -36,11 +36,11 @@ // These are too slow on Windows to actually include in the build. JC #if !LL_WINDOWS -#include "llapr.h" #include "lltut.h" #include "llhttpclient.h" #include "llformat.h" #include "llpipeutil.h" +#include "llproxy.h" #include "llpumpio.h" #include "llsdhttpserver.h" @@ -89,6 +89,7 @@ namespace tut LLCurl::initClass(false); mServerPump = new LLPumpIO(mPool); mClientPump = new LLPumpIO(mPool); + LLHTTPClient::setPump(*mClientPump); } @@ -96,6 +97,8 @@ namespace tut { delete mServerPump; delete mClientPump; + LLProxy::cleanupClass(); + apr_pool_destroy(mPool); } void setupTheServer() -- cgit v1.2.3