secondlife · mayconbekkers · Oct 17, 2025 · Oct 20, 2025 · Oct 20, 2025 · Oct 20, 2025
diff --git a/.build-variables b/.build-variables
diff --git a/docs/testing/doctest_quickstart.md b/docs/testing/doctest_quickstart.md
@@ -0,0 +1,39 @@
+# doctest quickstart
-# doctest quickstart
+# doctest quickstart
-# doctest quickstart
+# doctest quickstart
+
+This repository uses a header-only doctest setup with a thin helpers/compat layer.
+
+- Enable: `autobuild configure -c RelWithDebInfoOS -- -DLL_TESTS=ON`
+- Build targets: `llcommon_doctest` (subset of llcommon tests), `llmath_doctest`, `llcorehttp_doctest`, `login_doctest`
+- Run: `ctest -C RelWithDebInfo -R "(llcommon_doctest|llmath_doctest|llcorehttp_doctest|login_doctest)" -V`
+
+Notes:
+- Hand-authored tests are marked with `// DOCTEST_SKIP_AUTOGEN` to keep the generator idempotent.
+- `LL_CHECK_*` helpers provide clearer output for floats, buffers, wide strings, and ranges.
+- The HTTP fakes layer keeps tests network/IO-free by simulating responses with a monotonic clock and per-handle queues (redirects, retries, cancels).
+
+## Windows: local build with Autobuild and LL_TESTS
+
+Assumes a Windows setup with Visual Studio and Autobuild available on PATH.
+
+1. Open a “Developer Command Prompt for VS 2022” (x64).
+
+2. Change to the viewer root, e.g.:
+
+    cd D:\Projects\viewer
+
+3. Ensure there is a `build-variables` directory next to the source tree.  
+   If you already have `.build-variables` in this checkout, clone it locally:
+    xcopy /E /I .build-variables build-variables
+
+4. Configure a RelWithDebInfo build with tests enabled:
+    autobuild configure -c RelWithDebInfoOS -- -DLL_TESTS=ON
+
+5. Build the viewer and test binaries:
+    autobuild build -c RelWithDebInfoOS
+
+6. Run the doctest-based targets via CTest (adjust the build directory name if needed):
+    ctest -C RelWithDebInfo ^
+          -R "(llcommon_doctest|llmath_doctest|llcorehttp_doctest|login_doctest)" ^
+          -V --test-dir build-vc170-64
+
+The Autobuild configuration name (`RelWithDebInfoOS`) maps to the Visual Studio configuration `RelWithDebInfo`, which is the value used with `ctest -C`.
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
@@ -24,6 +24,8 @@ project(${ROOT_PROJECT_NAME})
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake"  "${CMAKE_CURRENT_BINARY_DIR}")
 
+enable_testing()
+
 include(conanbuildinfo OPTIONAL RESULT_VARIABLE USE_CONAN )
 if( USE_CONAN )
     set( USE_CONAN ON )
@@ -92,11 +94,6 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
 add_subdirectory(${LIBS_OPEN_PREFIX}llui)
 add_subdirectory(${LIBS_OPEN_PREFIX}viewer_components)
 
-if( LL_TESTS )
-# Legacy C++ tests. Build always, run if LL_TESTS is true.
-add_subdirectory(${VIEWER_PREFIX}test)
-endif()
-
 if (ENABLE_MEDIA_PLUGINS)
 # viewer media plugins
 add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
@@ -147,4 +144,3 @@ if (LL_TESTS)
   # individual apps can add themselves as dependencies
   add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests)
 endif (LL_TESTS)
-
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
@@ -22,6 +22,7 @@ set(cmake_SOURCE_FILES
         DeploySharedLibs.cmake
         Discord.cmake
         DragDrop.cmake
+        Doctest.cmake
         EXPAT.cmake
         FindAutobuild.cmake
         FreeType.cmake

diff --git a/indra/cmake/Doctest.cmake b/indra/cmake/Doctest.cmake
@@ -0,0 +1,6 @@
+# -*- cmake -*-
+include_guard(GLOBAL)
+
+if(NOT DEFINED DOCTEST_INCLUDE_DIR)
+    set(DOCTEST_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/extern/doctest")
+endif()
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
@@ -28,6 +28,7 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
   set(alltest_SOURCE_FILES
           ${CMAKE_SOURCE_DIR}/test/test.cpp
           ${CMAKE_SOURCE_DIR}/test/lltut.cpp
+          ${CMAKE_SOURCE_DIR}/test/lltest_harness.cpp
           )
   set(alltest_DEP_TARGETS
           # needed by the test harness itself
@@ -200,6 +201,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
           tests/${testname}_test.cpp
           ${CMAKE_SOURCE_DIR}/test/test.cpp
           ${CMAKE_SOURCE_DIR}/test/lltut.cpp
+          ${CMAKE_SOURCE_DIR}/test/lltest_harness.cpp
           ${additional_source_files}
           )
 

diff --git a/indra/extern/doctest/LICENSE b/indra/extern/doctest/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016-2024 Viktor Kirilov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.