From 6930ab0f0210280d11a58de51e75a8ffb91b999a Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Sat, 27 Aug 2016 01:24:08 -0400
Subject: [PATCH] Fix some of the tests
---
indra/cmake/DeploySharedLibs.cmake | 3 +--
indra/llplugin/slplugin/CMakeLists.txt | 2 +-
indra/newview/CMakeLists.txt | 18 +++++++++---------
indra/newview/tests/lllogininstance_test.cpp | 2 +-
.../updater/tests/llupdaterservice_test.cpp | 2 +-
indra/win_crash_logger/CMakeLists.txt | 2 +-
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/indra/cmake/DeploySharedLibs.cmake b/indra/cmake/DeploySharedLibs.cmake
index 36857b0a7f..41b7e6a5bb 100644
--- a/indra/cmake/DeploySharedLibs.cmake
+++ b/indra/cmake/DeploySharedLibs.cmake
@@ -5,8 +5,7 @@
# This script requires a few cmake variable to be set on the command line:
# BIN_NAME= The full path the the binary to search for dependecies.
# SEARCH_DIRS= The full paths to dirs to search for dependencies.
-# DST_PATH= The full path where the dependecies will be copied.
-
+# DST_PATH= The full path where the dependecies will be copied.
get_filename_component(current_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
include(GetPrerequisites)
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 6ef9af103a..97be1f81dd 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -88,5 +88,5 @@ if (DARWIN)
endif (DARWIN)
if (LL_TESTS)
- ll_deploy_sharedlibs_command(AlchemyPlugin)
+ #ll_deploy_sharedlibs_command(AlchemyPlugin)
endif (LL_TESTS)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 02b08c887d..872519af26 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2382,13 +2382,6 @@ if (LL_TESTS)
# if(USE_PRECOMPILED_HEADERS)
# set(test_sources "${test_sources}" llviewerprecompiledheaders.cpp)
# endif(USE_PRECOMPILED_HEADERS)
- set(test_libs
- ${LLMESSAGE_LIBRARIES}
- ${WINDOWS_LIBRARIES}
- ${LLVFS_LIBRARIES}
- ${LLMATH_LIBRARIES}
- ${LLCOMMON_LIBRARIES}
- )
if (LINUX)
# llcommon uses `clock_gettime' which is provided by librt on linux.
@@ -2401,9 +2394,11 @@ if (LL_TESTS)
${WINDOWS_LIBRARIES}
${LLVFS_LIBRARIES}
${LLMATH_LIBRARIES}
- ${LLCOMMON_LIBRARIES}
+ ${LLXML_LIBRARIES}
${LLMESSAGE_LIBRARIES}
+ ${LLLOGIN_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
+ ${LLCOMMON_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${LIBRT_LIBRARY}
@@ -2432,8 +2427,13 @@ if (LL_TESTS)
"${test_libs}"
)
+ set(llviewernetwork_test_sources
+ llviewernetwork.cpp
+ lllogininstance.cpp
+ )
+
LL_ADD_INTEGRATION_TEST(llviewernetwork
- llviewernetwork.cpp
+ "${llviewernetwork_test_sources}"
"${test_libs}"
)
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 5eda6204c1..f2b0fefc1b 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -150,7 +150,7 @@ std::map<std::string, std::string> LLGridManager::getKnownGrids() const
return result;
}
-void LLGridManager::setGridChoice(const std::string& grid_name)
+void LLGridManager::setGridChoice(const std::string&, const bool)
{
}
diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
index 2d8d621a5f..1cb21d3d72 100644
--- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
+++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
@@ -120,7 +120,7 @@ void LLUpdateDownloader::resume(void) {}
void LLUpdateDownloader::cancel(void) {}
void LLUpdateDownloader::setBandwidthLimit(U64 bytesPerSecond) {}
-int ll_install_update(std::string const &, std::string const &, bool, LLInstallScriptMode)
+int ll_install_update(std::string const &, std::string const &, std::string const &, std::string const &, bool, LLInstallScriptMode)
{
return 0;
}
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 68c5512924..2b72642a2c 100644
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -103,5 +103,5 @@ if (WINDOWS)
endif (WINDOWS)
if (LL_TESTS)
- ll_deploy_sharedlibs_command(windows-crash-logger)
+ #ll_deploy_sharedlibs_command(windows-crash-logger)
endif (LL_TESTS)
--
GitLab