From 27d6bbd3d98bde278cc828d6673a93c4702b3e80 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 8 Mar 2024 10:47:41 -0500
Subject: Allow build-time Lua tests to require() bundled Lua modules.

---
 indra/newview/llluamanager.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llluamanager.cpp b/indra/newview/llluamanager.cpp
index cd663021a1..c65f062fd7 100644
--- a/indra/newview/llluamanager.cpp
+++ b/indra/newview/llluamanager.cpp
@@ -435,7 +435,14 @@ void LLRequireResolver::findModule()
         fail();
     }
 
-    std::vector<std::string> lib_paths {gDirUtilp->getExpandedFilename(LL_PATH_SCRIPTS, "lua")};
+    std::vector<std::string> lib_paths
+    {
+        gDirUtilp->getExpandedFilename(LL_PATH_SCRIPTS, "lua"),
+#ifdef LL_TEST
+        // Build-time tests don't have the app bundle - use source tree.
+        std::filesystem::path(__FILE__).parent_path() / "scripts" / "lua",
+#endif
+    };
 
     for (const auto& path : lib_paths)
     {
-- 
cgit v1.2.3