summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-07-01 17:04:01 -0700
committerRichard Linden <none@none>2013-07-01 17:04:01 -0700
commit04bdc8ba83c297945dd60489c241b88adf892ff4 (patch)
treef19e8a7c87203242abd39450dd4cfbea6857ee55 /indra/test
parent2fc422f39ddaca25c69e8cf2092a9d66840379f3 (diff)
SH-4294 FIX Interesting: Statistics Texture cache hit rate is always 0%
also, removed LLTrace::init and cleanup removed derived class implementation of memory stat for LLMemTrackable is automatic now
Diffstat (limited to 'indra/test')
-rwxr-xr-xindra/test/test.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 28de88201c..10f71a2843 100755
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -41,6 +41,7 @@
#include "stringize.h"
#include "namedtempfile.h"
#include "lltrace.h"
+#include "lltracethreadrecorder.h"
#include "apr_pools.h"
#include "apr_getopt.h"
@@ -483,6 +484,8 @@ void wouldHaveCrashed(const std::string& message)
tut::fail("llerrs message: " + message);
}
+static LLTrace::ThreadRecorder* sMasterThreadRecorder = NULL;
+
int main(int argc, char **argv)
{
// The following line must be executed to initialize Google Mock
@@ -515,7 +518,11 @@ int main(int argc, char **argv)
ll_init_apr();
- LLTrace::init();
+ if (!sMasterThreadRecorder)
+ {
+ sMasterThreadRecorder = new LLTrace::ThreadRecorder();
+ LLTrace::set_master_thread_recorder(sMasterThreadRecorder);
+ }
apr_getopt_t* os = NULL;
if(APR_SUCCESS != apr_getopt_init(&os, gAPRPoolp, argc, argv))
{