diff options
| author | Oz Linden <oz@lindenlab.com> | 2019-01-16 11:05:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2019-01-16 11:05:55 -0500 |
| commit | f648758c2a3da2dd03c8f57e98598c085b2030a6 (patch) | |
| tree | 44fe8f158cbc667f95e7061e6137a3e8d73bc49e /indra/test | |
| parent | 6c533888ba3770572f2d7958460688562f03bfde (diff) | |
SL-10297: Modify LL_ERRS and other deliberate crashes to avoid a common stack frame
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp index b14c2eb255..125de72b79 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -146,7 +146,7 @@ public: mOldSettings(LLError::saveAndResetSettings()), mRecorder(new RecordToTempFile(pool)) { - LLError::setFatalFunction(wouldHaveCrashed); + LLError::overrideCrashOnError(wouldHaveCrashed); LLError::setDefaultLevel(level); LLError::addRecorder(mRecorder); } @@ -508,7 +508,7 @@ void stream_groups(std::ostream& s, const char* app) void wouldHaveCrashed(const std::string& message) { - tut::fail("llerrs message: " + message); + tut::fail("fatal error message: " + message); } static LLTrace::ThreadRecorder* sMasterThreadRecorder = NULL; @@ -532,7 +532,7 @@ int main(int argc, char **argv) LLError::initForApplication(".", ".", false /* do not log to stderr */); LLError::setDefaultLevel(LLError::LEVEL_DEBUG); } - LLError::setFatalFunction(wouldHaveCrashed); + LLError::overrideCrashOnError(wouldHaveCrashed); std::string test_app_name(argv[0]); std::string test_log = test_app_name + ".log"; LLFile::remove(test_log); |