summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2023-12-14 02:47:44 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2023-12-14 02:47:44 +0200
commit4b98ae6e8a4c54fa70246beb5d7ff28a5590e819 (patch)
tree11e49d0cb85d8420ac614f039b32e5ec16202de3 /indra/test
parent0db9bcf21fd4b7172e8a35cdb2805ccdc736e273 (diff)
parent07ace73c49918ffb70e99c2239849eaaabc1fe45 (diff)
Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts: # indra/newview/llspatialpartition.cpp
Diffstat (limited to 'indra/test')
-rw-r--r--indra/test/CMakeLists.txt7
-rw-r--r--indra/test/test.cpp2
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index b7a39a7450..4a0a8716c4 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -74,6 +74,13 @@ if (WINDOWS)
LINK_FLAGS "/NODEFAULTLIB:LIBCMT"
LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
)
+elseif (DARWIN)
+ # Support our "@executable_path/../Resources" load path for our test
+ # executable. This SHOULD properly be "$<TARGET_FILE_DIR:lltest>/Resources",
+ # but the CMake $<TARGET_FILE_DIR> generator expression isn't evaluated by
+ # CREATE_LINK, so fudge it.
+ file(CREATE_LINK "../sharedlibs/Release/Resources" "${CMAKE_BINARY_DIR}/test/Resources"
+ SYMBOLIC)
endif (WINDOWS)
set(TEST_EXE $<TARGET_FILE:lltest>)
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 4987cf4727..a265e1273b 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -259,7 +259,7 @@ public:
break;
case tut::test_result::ex:
++mFailedTests;
- out << "exception: " << tr.exception_typeid;
+ out << "exception: " << LLError::Log::demangle(tr.exception_typeid.c_str());
break;
case tut::test_result::warn:
++mFailedTests;