From b6a08ad007deb855ce4d428654279206853a3b99 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 13 Jan 2012 12:41:54 -0500
Subject: Extract APR and temp-fixture-file helper code to indra/test.
 Specifically: Introduce ManageAPR class in indra/test/manageapr.h. This is
 useful for a simple test program without lots of static constructors. Extract
 NamedTempFile from llsdserialize_test.cpp to indra/test/ namedtempfile.h.
 Refactor to use APR file operations rather than platform- dependent APIs. Use
 NamedTempFile for llprocesslauncher_test.cpp.

---
 indra/test/manageapr.h | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 indra/test/manageapr.h

(limited to 'indra/test/manageapr.h')

diff --git a/indra/test/manageapr.h b/indra/test/manageapr.h
new file mode 100644
index 0000000000..0c1ca7b7be
--- /dev/null
+++ b/indra/test/manageapr.h
@@ -0,0 +1,45 @@
+/**
+ * @file   manageapr.h
+ * @author Nat Goodspeed
+ * @date   2012-01-13
+ * @brief  ManageAPR class for simple test programs
+ * 
+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$
+ * Copyright (c) 2012, Linden Research, Inc.
+ * $/LicenseInfo$
+ */
+
+#if ! defined(LL_MANAGEAPR_H)
+#define LL_MANAGEAPR_H
+
+#include "llapr.h"
+
+/**
+ * Declare a static instance of this class for dead-simple ll_init_apr() at
+ * program startup, ll_cleanup_apr() at termination. This is recommended for
+ * use only with simple test programs. Once you start introducing static
+ * instances of other classes that depend on APR already being initialized,
+ * the indeterminate static-constructor-order problem rears its ugly head.
+ */
+class ManageAPR
+{
+public:
+    ManageAPR()
+    {
+        ll_init_apr();
+    }
+
+    ~ManageAPR()
+    {
+        ll_cleanup_apr();
+    }
+
+    static std::string strerror(apr_status_t rv)
+    {
+        char errbuf[256];
+        apr_strerror(rv, errbuf, sizeof(errbuf));
+        return errbuf;
+    }
+};
+
+#endif /* ! defined(LL_MANAGEAPR_H) */
-- 
cgit v1.2.3


From d99acd56cdc41d72a073a4419e3e51c356e675bb Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 6 Feb 2012 17:06:55 -0500
Subject: ManageAPR should be noncopyable. Make that explicit. Any RAII class
 should either be noncopyable or should deal appropriately with a copy
 operation. ManageAPR is intended only for extremely simple cases, and hence
 should be noncopyable.

---
 indra/test/manageapr.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/test/manageapr.h')

diff --git a/indra/test/manageapr.h b/indra/test/manageapr.h
index 0c1ca7b7be..2452fb6ae4 100644
--- a/indra/test/manageapr.h
+++ b/indra/test/manageapr.h
@@ -13,6 +13,7 @@
 #define LL_MANAGEAPR_H
 
 #include "llapr.h"
+#include <boost/noncopyable.hpp>
 
 /**
  * Declare a static instance of this class for dead-simple ll_init_apr() at
@@ -21,7 +22,7 @@
  * instances of other classes that depend on APR already being initialized,
  * the indeterminate static-constructor-order problem rears its ugly head.
  */
-class ManageAPR
+class ManageAPR: public boost::noncopyable
 {
 public:
     ManageAPR()
-- 
cgit v1.2.3