summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2019-11-15 08:11:32 -0500
committerNat Goodspeed <nat@lindenlab.com>2020-03-25 19:07:22 -0400
commit39f4acd92144546d346ecd63224945da8d64c5db (patch)
tree41e543382a90772b2f576b18a819c8131c78799f
parentbf8aea5059f127dcce2fdf613d62c253bb3fa8fd (diff)
DRTVWR-476: Conflate LOGFAIL env var empty with completely unset.
Sometimes it's useful to be able to temporarily override an existing LOGFAIL setting in the current environment. It's far more convenient to prepend LOGFAIL='' to a command than to 'unset LOGFAIL' as a whole separate command -- and then remember to restore its previous value.
-rw-r--r--indra/test/test.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 51f0e80043..6b342ffe89 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -631,8 +631,9 @@ int main(int argc, char **argv)
const char* LOGFAIL = getenv("LOGFAIL");
boost::shared_ptr<LLReplayLog> replayer;
// As described in stream_usage(), LOGFAIL overrides both --debug and
- // LOGTEST.
- if (LOGFAIL)
+ // LOGTEST. But allow user to set LOGFAIL empty to revert to LOGTEST
+ // and/or --debug.
+ if (LOGFAIL && *LOGFAIL)
{
LLError::ELevel level = LLError::decodeLevel(LOGFAIL);
replayer.reset(new LLReplayLogReal(level, gAPRPoolp));