diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-03-13 13:21:48 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-03-13 13:21:48 -0700 |
| commit | 898c9f44218353b3bf71b78ffce02662b4927625 (patch) | |
| tree | 2793682ba7d69d34730a4aeced04100312a479a2 /indra/llcorehttp/tests | |
| parent | 868cd32e5e229e503f1b5b1d5ec543fd6f76cb7f (diff) | |
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
Diffstat (limited to 'indra/llcorehttp/tests')
| -rw-r--r-- | indra/llcorehttp/tests/test_refcounted.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcorehttp/tests/test_refcounted.hpp b/indra/llcorehttp/tests/test_refcounted.hpp index 6a516f60c0..5dff143e5d 100644 --- a/indra/llcorehttp/tests/test_refcounted.hpp +++ b/indra/llcorehttp/tests/test_refcounted.hpp @@ -30,7 +30,7 @@ #include "test_allocator.h" -#if WANT_TESTS_WITH_RACES_THAT_HANG +#if 0 // disable all of this because it's hanging win64 builds? using namespace LLCoreInt; namespace tut @@ -153,6 +153,5 @@ namespace tut ensure(mMemTotal == (GetMemTotal() - sizeof(RefCounted))); } } -#endif - +#endif // if 0 #endif // TEST_LLCOREINT_REF_COUNTED_H_ |