summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/tests/llcorehttp_test.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-06-11 12:24:54 -0400
committerMonty Brandenberg <monty@lindenlab.com>2012-06-11 12:24:54 -0400
commitf4a59854c5aab0fb1f666d8df45984a0f4cfd465 (patch)
tree829db592a32560b2fe02180ae9a677470cc23489 /indra/llcorehttp/tests/llcorehttp_test.cpp
parent28a04400b4160dd34166483ddcf0c12637bcc363 (diff)
Unit test fixups. Mac/Linux detect memory leak due to llwarns, try/catch cleanup.
Our logging holds on to a changing bit of memory between operations and the memory leak detection I'm using senses this and complains. So, for now, disable the final memory check on Mac & Linux, leave it active on Windows. Solve this for real some other day. Add try/catch blocks to do cleanup in unit tests that go wrong so that we don't get a cascade of assertion failures when subsequent tests find singletons still alive.
Diffstat (limited to 'indra/llcorehttp/tests/llcorehttp_test.cpp')
-rw-r--r--indra/llcorehttp/tests/llcorehttp_test.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/llcorehttp/tests/llcorehttp_test.cpp b/indra/llcorehttp/tests/llcorehttp_test.cpp
index 0ee767fdca..2d48bca443 100644
--- a/indra/llcorehttp/tests/llcorehttp_test.cpp
+++ b/indra/llcorehttp/tests/llcorehttp_test.cpp
@@ -130,12 +130,3 @@ void ssl_locking_callback(int mode, int type, const char * /* file */, int /* li
}
-#if defined(WIN32)
-
-int getopt(int argc, char * const argv[], const char *optstring)
-{
- return -1;
-}
-
-#endif
-