From 384e91db426e068f9cd8ba806313895657ae4247 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 29 Sep 2020 12:48:32 -0400
Subject: [PATCH] Reenable llagentaccess test and enable llslurl tests on linux
---
indra/newview/CMakeLists.txt | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 72519ae6554..91b4b038c8a 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2578,6 +2578,11 @@ if (LL_TESTS)
${BOOST_CONTEXT_LIBRARY}
)
+ LL_ADD_INTEGRATION_TEST(llagentaccess
+ llagentaccess.cpp
+ "${test_libs}"
+ )
+
LL_ADD_INTEGRATION_TEST(llsechandler_basic
llsechandler_basic.cpp
"${test_libs}"
@@ -2588,18 +2593,15 @@ if (LL_TESTS)
"${test_libs}"
)
- if (NOT LINUX)
- set(llslurl_test_sources
- llslurl.cpp
- llviewernetwork.cpp
- )
-
-
- LL_ADD_INTEGRATION_TEST(llslurl
- "${llslurl_test_sources}"
- "${test_libs}"
+ set(llslurl_test_sources
+ llslurl.cpp
+ llviewernetwork.cpp
)
- endif()
+
+ LL_ADD_INTEGRATION_TEST(llslurl
+ "${llslurl_test_sources}"
+ "${test_libs}"
+ )
LL_ADD_INTEGRATION_TEST(llviewernetwork
llviewernetwork.cpp
@@ -2611,10 +2613,12 @@ if (LL_TESTS)
"${test_libs}"
)
-# LL_ADD_INTEGRATION_TEST(llhttpretrypolicy "llhttpretrypolicy.cpp" "${test_libs}")
+ LL_ADD_INTEGRATION_TEST(llhttpretrypolicy
+ llhttpretrypolicy.cpp
+ "${test_libs}"
+ )
#ADD_VIEWER_BUILD_TEST(llmemoryview viewer)
- #ADD_VIEWER_BUILD_TEST(llagentaccess viewer)
#ADD_VIEWER_BUILD_TEST(lltextureinfo viewer)
#ADD_VIEWER_BUILD_TEST(lltextureinfodetails viewer)
--
GitLab