merge back late changes and tags from release branch

1 files changed, 12 insertions, 5 deletions

diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 45e8aef99a..ffdb0cb976 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -37,8 +37,8 @@
 #include "linden_common.h"
 #include "llerrorcontrol.h"
 #include "lltut.h"
-#include "llaprpool.h"
 
+#include "apr_pools.h"
 #include "apr_getopt.h"
 
 // the CTYPE_WORKAROUND is needed for linux dev stations that don't
@@ -349,12 +349,17 @@ int main(int argc, char **argv)
 	ctype_workaround();
 #endif
 
-	LLAPRPool pool;
-	pool.create();
+	apr_initialize();
+	apr_pool_t* pool = NULL;
+	if(APR_SUCCESS != apr_pool_create(&pool, NULL))
+	{
+		std::cerr << "Unable to initialize pool" << std::endl;
+		return 1;
+	}
 	apr_getopt_t* os = NULL;
-	if(APR_SUCCESS != apr_getopt_init(&os, pool(), argc, argv))
+	if(APR_SUCCESS != apr_getopt_init(&os, pool, argc, argv))
 	{
-		std::cerr << "Unable to initialize the arguments for parsing by apr_getopt()." << std::endl;
+		std::cerr << "Unable to  pool" << std::endl;
 		return 1;
 	}
 
@@ -472,6 +477,8 @@ int main(int argc, char **argv)
 		s.close();
 	}
 
+	apr_terminate();
+
 	int retval = (success ? 0 : 1);
 	return retval;