From 6d545bf8c9e9bf4f588f1e4acc03a6b7b8deb992 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 17 Mar 2024 15:36:40 -0400
Subject: [PATCH] Fix tests when debug message macros are disabled
---
indra/llcommon/llerror.h | 10 +++++-----
indra/llcommon/llprocess.cpp | 4 ++--
indra/llcommon/llsingleton.cpp | 4 ++--
indra/llcommon/llsys.cpp | 2 +-
indra/llcommon/tests/llerror_test.cpp | 15 +++++++++++++++
indra/llcommon/tests/llsdserialize_test.cpp | 8 ++++----
indra/llmessage/llavatarnamecache.cpp | 6 +++---
indra/llmessage/llexperiencecache.cpp | 4 ++--
indra/llmessage/llsdmessagebuilder.cpp | 2 +-
indra/llplugin/llplugininstance.cpp | 2 +-
indra/llplugin/llpluginprocesschild.cpp | 10 +++++-----
indra/llprimitive/llprimitive.cpp | 4 ++--
indra/llrender/llrender.cpp | 4 ++--
13 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index 895c7b92cca..cb4a0b8829a 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -55,13 +55,13 @@ const int LL_ERR_NOERR = 0;
#else // _DEBUG
#ifdef LL_RELEASE_WITH_DEBUG_INFO
-#define SHOW_ASSERT 1
-#define SHOW_DEBUG 1
-#define ENABLE_DEBUG_MACRO 1
+#define SHOW_ASSERT
+#define SHOW_DEBUG
+#define ENABLE_DEBUG_MACRO
#endif // LL_RELEASE_WITH_DEBUG_INFO
#ifdef RELEASE_SHOW_DEBUG
-#define SHOW_DEBUG 1
+#define SHOW_DEBUG
#endif
#ifdef RELEASE_SHOW_WARN
@@ -402,7 +402,7 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
std::ostringstream _out; \
_out
-#if ENABLE_DEBUG_MACRO
+#ifdef ENABLE_DEBUG_MACRO
#define lllog_debug(level, once, ...) \
do { \
diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp
index 46331aafb9c..c199dc7a1d6 100644
--- a/indra/llcommon/llprocess.cpp
+++ b/indra/llcommon/llprocess.cpp
@@ -394,7 +394,7 @@ class ReadPipeImpl: public LLProcess::ReadPipe
// Handle EOF specially: it's part of normal-case processing.
if (err == APR_EOF)
{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("LLProcess") << "EOF on " << mDesc << LL_ENDL;
#endif
}
@@ -416,7 +416,7 @@ class ReadPipeImpl: public LLProcess::ReadPipe
// received. Make sure we commit those later. (Don't commit them
// now, that would invalidate the buffer iterator sequence!)
tocommit += gotten;
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("LLProcess") << "filled " << gotten << " of " << toread
<< " bytes from " << mDesc << LL_ENDL;
#endif
diff --git a/indra/llcommon/llsingleton.cpp b/indra/llcommon/llsingleton.cpp
index 76a36c90057..e6edac1575d 100644
--- a/indra/llcommon/llsingleton.cpp
+++ b/indra/llcommon/llsingleton.cpp
@@ -270,7 +270,7 @@ void LLSingletonBase::reset_initializing(list_t::size_type size)
void LLSingletonBase::MasterList::LockedInitializing::log(const char* verb, const char* name)
{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("LLSingleton") << verb << ' ' << demangle(name) << ';';
if (mList)
{
@@ -473,7 +473,7 @@ void LLSingletonBase::loginfos(const string_params& args)
//static
void LLSingletonBase::logdebugs(const string_params& args)
{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("LLSingleton") << args << LL_ENDL;
#endif
}
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 60688f2fda1..d82fc947b5f 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -962,7 +962,7 @@ LLMemoryInfo& LLMemoryInfo::refresh()
LL_PROFILE_ZONE_SCOPED
mStatsMap = loadStatsMap();
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("LLMemoryInfo") << "Populated mStatsMap:\n";
LLSDSerialize::toPrettyXML(mStatsMap, LL_CONT);
LL_ENDL;
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp
index b4cdbdc6bf1..d4ed29fd9e8 100644
--- a/indra/llcommon/tests/llerror_test.cpp
+++ b/indra/llcommon/tests/llerror_test.cpp
@@ -283,6 +283,9 @@ namespace tut
void ErrorTestObject::test<2>()
// messages are filtered based on default level
{
+#ifndef ENABLE_DEBUG_MACRO
+ skip("Debug messages disabled");
+#endif
LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
writeSome();
ensure_message_field_equals(0, MSG_FIELD, "one");
@@ -326,6 +329,9 @@ namespace tut
void ErrorTestObject::test<3>()
// error type string in output
{
+#ifndef ENABLE_DEBUG_MACRO
+ skip("Debug messages disabled");
+#endif
writeSome();
ensure_message_field_equals(0, LEVEL_FIELD, "DEBUG");
ensure_message_field_equals(1, LEVEL_FIELD, "INFO");
@@ -539,6 +545,9 @@ namespace tut
void ErrorTestObject::test<5>()
// backslash, return, and newline are not escaped with backslashes
{
+#ifndef ENABLE_DEBUG_MACRO
+ skip("Debug messages disabled");
+#endif
LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
setWantsMultiline(true);
writeMsgNeedsEscaping(); // but should not be now
@@ -880,6 +889,9 @@ namespace tut
void ErrorTestObject::test<17>()
// backslash, return, and newline are escaped with backslashes
{
+#ifndef ENABLE_DEBUG_MACRO
+ skip("Debug messages disabled");
+#endif
LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
writeMsgNeedsEscaping();
ensure_message_field_equals(0, MSG_FIELD, "backslash\\\\");
@@ -907,6 +919,9 @@ namespace tut
void ErrorTestObject::test<18>()
// space character is not allowed in a tag
{
+#ifndef ENABLE_DEBUG_MACRO
+ skip("Debug messages disabled");
+#endif
LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
fatalWasCalled = false;
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index ac40125f752..3cec6c6e469 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -501,7 +501,7 @@ namespace tut
template<> template<>
void TestLLSDSerializeObject::test<1>()
{
- setFormatterParser(new LLSDNotationFormatter(false, "", LLSDFormatter::OPTIONS_PRETTY_BINARY),
+ setFormatterParser(new LLSDNotationFormatter(false, false, "", LLSDFormatter::OPTIONS_PRETTY_BINARY),
new LLSDNotationParser());
doRoundTripTests("pretty binary notation serialization");
}
@@ -509,7 +509,7 @@ namespace tut
template<> template<>
void TestLLSDSerializeObject::test<2>()
{
- setFormatterParser(new LLSDNotationFormatter(false, "", LLSDFormatter::OPTIONS_NONE),
+ setFormatterParser(new LLSDNotationFormatter(false, false, "", LLSDFormatter::OPTIONS_NONE),
new LLSDNotationParser());
doRoundTripTests("raw binary notation serialization");
}
@@ -566,7 +566,7 @@ namespace tut
template<> template<>
void TestLLSDSerializeObject::test<8>()
{
- setFormatterParser(new LLSDNotationFormatter(false, "", LLSDFormatter::OPTIONS_NONE),
+ setFormatterParser(new LLSDNotationFormatter(false, false, "", LLSDFormatter::OPTIONS_NONE),
new LLSDNotationParser());
setParser(LLSDSerialize::deserialize);
// This is an interesting test because LLSDNotationFormatter does not
@@ -577,7 +577,7 @@ namespace tut
template<> template<>
void TestLLSDSerializeObject::test<9>()
{
- setFormatterParser(new LLSDXMLFormatter(false, "", LLSDFormatter::OPTIONS_NONE),
+ setFormatterParser(new LLSDXMLFormatter(false, false, "", LLSDFormatter::OPTIONS_NONE),
new LLSDXMLParser());
setParser(LLSDSerialize::deserialize);
// This is an interesting test because LLSDXMLFormatter does not
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index debf87aafc5..9623dca2818 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -131,7 +131,7 @@ LLAvatarNameCache::~LLAvatarNameCache()
void LLAvatarNameCache::requestAvatarNameCache_(std::string url, std::vector<LLUUID> agentIds)
{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("AvNameCache") << "Entering coroutine " << LLCoros::getName()
<< " with url '" << url << "', requesting " << agentIds.size() << " Agent Ids" << LL_ENDL;
#endif
@@ -152,7 +152,7 @@ void LLAvatarNameCache::requestAvatarNameCache_(std::string url, std::vector<LLU
LLCoreHttpUtil::HttpCoroutineAdapter httpAdapter("NameCache", sHttpPolicy);
LLSD results = httpAdapter.getAndSuspend(sHttpRequest, url);
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS() << results << LL_ENDL;
#endif
@@ -290,7 +290,7 @@ void LLAvatarNameCache::handleAgentError(const LLUUID& agent_id)
LLAvatarNameCache::mPendingQueue.erase(agent_id);
LLAvatarName& av_name = existing->second;
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("AvNameCache") << "LLAvatarNameCache use cache for agent " << agent_id << LL_ENDL;
#endif
av_name.dump();
diff --git a/indra/llmessage/llexperiencecache.cpp b/indra/llmessage/llexperiencecache.cpp
index 82165fd844f..d7f8cbb84d0 100644
--- a/indra/llmessage/llexperiencecache.cpp
+++ b/indra/llmessage/llexperiencecache.cpp
@@ -296,7 +296,7 @@ void LLExperienceCache::requestExperiencesCoro(LLCoreHttpUtil::HttpCoroutineAdap
const LLSD& row = *it;
LLUUID public_key = row[EXPERIENCE_ID].asUUID();
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("ExperienceCache") << "Received result for " << public_key
<< " display '" << row[LLExperienceCache::NAME].asString() << "'" << LL_ENDL;
#endif
@@ -478,7 +478,7 @@ bool LLExperienceCache::fetch(const LLUUID& key, bool refresh/* = true*/)
{
if(!key.isNull() && !isRequestPending(key) && (refresh || mCache.find(key)==mCache.end()))
{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("ExperienceCache") << " queue request for " << EXPERIENCE_ID << " " << key << LL_ENDL;
#endif
diff --git a/indra/llmessage/llsdmessagebuilder.cpp b/indra/llmessage/llsdmessagebuilder.cpp
index 371c503e5f3..9f543994f5b 100644
--- a/indra/llmessage/llsdmessagebuilder.cpp
+++ b/indra/llmessage/llsdmessagebuilder.cpp
@@ -385,7 +385,7 @@ void LLSDMessageBuilder::copyFromMessageData(const LLMsgData& data)
void LLSDMessageBuilder::copyFromLLSD(const LLSD& msg)
{
mCurrentMessage = msg;
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS() << LLSDNotationStreamer(mCurrentMessage) << LL_ENDL;
#endif
}
diff --git a/indra/llplugin/llplugininstance.cpp b/indra/llplugin/llplugininstance.cpp
index 9e9aac98f17..d16e37ce2c3 100644
--- a/indra/llplugin/llplugininstance.cpp
+++ b/indra/llplugin/llplugininstance.cpp
@@ -174,7 +174,7 @@ void LLPluginInstance::receiveMessage(const char *message_string)
{
if(mOwner)
{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("Plugin") << "processing incoming message: \"" << message_string << "\"" << LL_ENDL;
#endif
mOwner->receivePluginMessage(message_string);
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp
index e5ae0dd34fb..bd1a0261d69 100644
--- a/indra/llplugin/llpluginprocesschild.cpp
+++ b/indra/llplugin/llpluginprocesschild.cpp
@@ -339,7 +339,7 @@ void LLPluginProcessChild::sendMessageToParent(const LLPluginMessage &message)
{
std::string buffer = message.generate();
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("Plugin") << "Sending to parent: " << buffer << LL_ENDL;
#endif
@@ -349,7 +349,7 @@ void LLPluginProcessChild::sendMessageToParent(const LLPluginMessage &message)
void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
{
// Incoming message from the TCP Socket
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("Plugin") << "Received from parent: " << message << LL_ENDL;
#endif
@@ -490,7 +490,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
/* virtual */
void LLPluginProcessChild::receivePluginMessage(const std::string &message)
{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("Plugin") << "Received from plugin: " << message << LL_ENDL;
#endif
@@ -575,7 +575,7 @@ void LLPluginProcessChild::receivePluginMessage(const std::string &message)
if (passMessage)
{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("Plugin") << "Passing through to parent: " << message << LL_ENDL;
#endif
writeMessageRaw(message);
@@ -598,7 +598,7 @@ void LLPluginProcessChild::receivePluginMessage(const std::string &message)
void LLPluginProcessChild::setState(EState state)
{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("Plugin") << "setting state to " << state << LL_ENDL;
#endif
mState = state;
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index e7e033ac9a9..7e0a858486b 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -1414,7 +1414,7 @@ S32 LLPrimitive::parseTEMessage(LLMessageSystem* mesgsys, char const* block_name
tec.face_count = llmin((U32)getNumTEs(),(U32)LLTEContents::MAX_TES);
U8 *cur_ptr = tec.packed_buffer;
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("TEXTUREENTRY") << "Texture Entry with buffere sized: " << tec.size << LL_ENDL;
#endif
U8 *buffer_end = tec.packed_buffer + tec.size;
@@ -1550,7 +1550,7 @@ S32 LLPrimitive::unpackTEMessage(LLDataPacker &dp)
U32 i;
U8 *cur_ptr = packed_buffer;
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS("TEXTUREENTRY") << "Texture Entry with buffer sized: " << size << LL_ENDL;
#endif
U8 *buffer_end = packed_buffer + size;
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index d16393265ab..0c1e04d43d2 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -259,7 +259,7 @@ bool LLTexUnit::bind(LLTexture* texture, bool for_rendering, bool forceBind)
}
else
{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
if (texture)
{
LL_DEBUGS() << "NULL LLTexUnit::bind GL image" << LL_ENDL;
@@ -289,7 +289,7 @@ bool LLTexUnit::bind(LLImageGL* texture, bool for_rendering, bool forceBind, S32
if(!texture)
{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
LL_DEBUGS() << "NULL LLTexUnit::bind texture" << LL_ENDL;
#endif
return false;
--
GitLab