summaryrefslogtreecommitdiff
path: root/indra/cmake/LLAddBuildTest.cmake
AgeCommit message (Collapse)Author
2013-01-14Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2013-01-08merge changes for DRTVWR-250Oz Linden
2012-12-07Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to ↵Logan Dethrow
point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake.
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-09-07Further attempts to erradicate TCMALLOCsimon@Simon-PC.lindenlab.com
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Cmake files not merged correctly and had to be done by hand. New memory allocation made some memory usage tests in the llcorehttp integration tests no longer valid. Would like to work on LLLog sometime and get it to be consistent. Special flags needed for windows build of example program.
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-08-02mergeBrad Payne (Vir Linden)
2012-08-02MAINT-515 FIX, CHOP-100 FIX - technically we are avoiding these issues ↵Brad Payne (Vir Linden)
rather than fixing them; changing llcommon to be statically linked avoids the symbol issues with llcommon.dll
2012-01-06SH-2789 WIP - fixing the LL_USE_TCMALLOC code, make tests build with the ↵Brad Payne (Vir Linden)
same tcmalloc options as the sl executable
2011-05-06Continuing work on CHOP-609 build time improvements. Fixed eroneous ↵brad kittenbrink
additional_INCLUDE_DIRS setting for unit tests.
2011-03-19merged OPEN-39: include Tut.cmake for integration tests (fixes ↵Boroondas Gupte
"bitpack_test.o: No such file or directory" on standalone)
2011-03-19OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No ↵Boroondas Gupte
such file or directory" on standalone)
2011-02-09STORM-981 : Fix Linux link issues when LL_TESTS is ONMerov Linden
2011-01-06STORM-826 (workaround): correct mixed and dos-style line endingsOz Linden
2010-12-16VWR-24251: Fix -DLL_TESTS:BOOL=ON on standalone when Tut is installed in a ↵Aleric Inglewood
non-standard directory. If tut/tut.hpp isn't installed in a standard include directory all tests fail because the found include directory for tut isn't passed to the compiler. This patch fixes this by passing it. Note that using include_directories() in a Find*.cmake file is bad practise. The correct way is to set an include dir variable and call include_directories() once. It certainly doesn't work for the tests anyway because the tests are all over the place and include_directories is on a per folder basis. What is needed is to set it for each (test) target. However, there is no TARGET_INCLUDE_DIRECTORIES. The closest thing that we have is to set the COMPILE_FLAGS property for a target. Fortunately, standalone is only used for linux, so we can just use -I${TUT_INCLUDE_DIR} to get the effect we want.
2010-11-10CHOP-151 Imported patch from server-trunk to support preprocessor at unit ↵Mark Palange (Mani)
tests. Rev. by Brad
2010-10-12merged SNOW-756 / VWR-23385 / STORM-374 (fixed standalone LD_LIBRARY_PATH ↵Boroondas Gupte
for unit tests)
2010-10-12SNOW-756 / VWR-23385 FOLLOWUP fixed indentationBoroondas Gupte
2010-10-12SNOW-756 / VWR-23385 FIXED standalone LD_LIBRARY_PATH for unit testsBoroondas Gupte (patch by Aleric Inglewood)
Used patch from https://jira.secondlife.com/secure/attachment/41586/SNOW-756-standalone_tests.diff patching file indra/cmake/LLAddBuildTest.cmake Hunk #1 succeeded at 259 with fuzz 2 (offset 1 line). Added entry in doc/contributions.txt. No further changes. originally commited to Snowglobe 2.1 at http://svn.secondlife.com/trac/linden/changeset/3515
2010-08-19VWR-20810 (SNOW-503) Quote EXE_STAGING_DIR to prevent it failing with some pathsAimee Linden
2010-06-18Centralize LD_LIBRARY_PATH logic with new SET_TEST_PATH macro.Nat Goodspeed
Add ${SHARED_LIB_STAGING_DIR_RELEASE} to LD_LIBRARY_PATH for executing tests: otherwise Debug-build tests can't find (e.g.) the aprutil DLL, for which we don't build/package a debug variant. Leverage discovery that a CMake macro can accept a target variable name argument for LL_TEST_COMMAND macro.
2010-06-21Remove tab chars inherited with file...Nat Goodspeed
2010-06-21EXT-7926: fix broken LD_LIBRARY_PATH handling on Windows.Nat Goodspeed
Recent checkins introduced two different CMake macros SET_TEST_LIST (which returned a CMake list of PATH directory strings) and SET_TEST_PATH (which returned a single platform-appropriate PATH string). On Windows, whose path-separator character is ';', SET_TEST_PATH interacted badly with CMake: in CMake, a single string containing ';' characters is indistinguishable from a list of strings. Eliminate the return-single-string form, redirecting the name SET_TEST_PATH to the macro that returns a CMake list. Make LL_TEST_COMMAND expect a list value, prepending each directory string with run_build_test.py's -l switch.
2009-11-03Continuing work on DEV-41724/DEV-41725 normalizing shared lib staging.brad kittenbrink
It's basically working on linux.
2009-10-20It seems that ADD_INTEGRATION_TEST tests now require GoogleMock to buildNat Goodspeed
2009-10-16merge from latest svn/viewer-2-0 to hg/viewer-2-0Mark Palange (Mani)
2009-10-08DEV-41080Adam Moss
The unit testing framework itself doesn't (shouldn't) depend upon llmath, so relax that dependancy when we're actually testing llmath itself. This makes llmath unit-testable. Subsequently, upgrade some of the llmath Integration tests to something much closer to Unit tests (hooray).
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-08QAR-1619: Finish replacing RunBuildTest.cmake with run_build_test.py.Nat Goodspeed
Because the details of RunBuildTest.cmake versus run_build_test.py had to be changed in so many different places, introduce LL_TEST_COMMAND CMake macro (in LLTestCommand.cmake) to encapsulate construction of the actual command line. Use LL_TEST_COMMAND in LL_ADD_PROJECT_UNIT_TESTS, LL_ADD_INTEGRATION_TEST, the big indra/test monolith and the various LslCompilerMacros. Fix run_build_test.py to pass through the test executable's own options (e.g. --touch, --output) without inspection. Defend it against the case when the platform-specific library path environment variable doesn't yet exist. Make it report errors only on nonzero test-program rc. Remove RunBuildTest.cmake.
2009-09-01RunBuildTest.cmake definitely needs the separate_arguments() command, elseNat Goodspeed
when you pass in a command string with command-line arguments, RunBuildTest.cmake attempts to search for a program whose filename is the entire command line. Uncommented separate_arguments(). Added SHARED_LIB_STAGING_DIR to LL_ADD_INTEGRATION_TEST LD_LIBRARY_PATH.
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-28DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro.Nat Goodspeed
LL_ADD_INTEGRATION_TEST supports tests that may require linking against one or more Linden libraries, or that should be executed with a wrapper script. Use this to test lllazy.cpp, llsdmessage.cpp and llcapabilitylistener.cpp.
2009-07-30Fixes to build on linux for DEV-35401.palmer@eniac54.lindenlab.com
Moves libllcommon.so to a staging dir for unit tests to work and gets rid of LL_COMMON_API in forward declarations
2009-07-28DEV-35399 - Making the server build llcommon.dll compatible.Mark Palange (Mani)
Fixing up string escaping on calls to RunBuildTest.cmake Also added ilasm.bat to the FindMono.cmake search
2009-07-14QAR-1651Dave Hiller
svn merge -r126784:126785 svn+ssh://svn.lindenlab.com/svn/linden/branches/mock-3 into trunk
2009-07-10Expanded tabs in cmake filespalmer@945battery-guestB-224.lindenlab.com
2009-07-09Moveing around DLL copying to support building llcommon.dll and using ↵Mark Palange (Mani)
llcommon.dll while running unit tests.
2009-06-19result of "svn merge -r123757:124890 ↵Paul Oppenheim
svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
2009-03-20svn merge -r113004:115000 ↵Dave Simmons
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge latest 1.26 into trunk
2009-03-09svn merge -r113780:113785Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/gst3-t113732 QAR-1333 linux gstreamer compatibility improvements and ADD_BUILD_TEST improvements - combo merge
2009-03-02Clean up use of tutBryan O'Sullivan
2009-02-26Fixed check to ensure the tests file actually existsJim Purbrick
Actually coded by DaveH, reviewed by CG
2009-02-26Go a different route - do not include tut tests in open source builds and ↵Christian Goetze
conditionally exclude the cmake macro upon availability of the source files. Reviewed by Scouse
2009-02-25svn merge -r108815:112761 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 The biggest things in this are Scalable Space Servers and Maint-Server-6 QAR-1209 : SSS QAR-1295 : maint-server-6 Conflicts resolved by prospero: C scripts/farm_distribute C scripts/automated_build_scripts/build-linux.sh : resolved by prospero, mostly kept the merge-right version in the conflict, but there was one block of repeated code from earlier that I removed. C scripts/automated_build_scripts/build-mac.sh : kept merge-right C indra/llcommon/llversionserver.h : svn revert C indra/newsim/llsimparcel.h : kept *both*... working had "setArea", merge-right had exportStream and importStream C indra/newsim/llsimparcel.cpp : see llsimparcel.h C indra/newsim/lltask.h : working had LLTask derived also from LLScriptResourceConsumer, merge-right had LLTask dervied also from LLAgentPosition. To resolve conflict, derive from both. C indra/newsim/lllslmanager.h : kept merge-right (had an added comment) C indra/llmessage/llhttpnode.h : kept working (added the definition of method LLHTTPNode::extendedResult) C indra/lscript/lscript_execute_mono/llscriptexecutemono.cpp C indra/lscript/lscript_execute_mono/llscriptexecutemono.h : These two were resolved by si, in consultation with daveh I also had to add the following stubs to indra/newsim/tests/llgodkickutils_test.cpp in order to get it to compile: // LLScriptResourceConsumer interface methods in LLTask LLScriptResource::LLScriptResource() { } LLScriptResourcePool::LLScriptResourcePool() { } LLScriptResourcePool LLScriptResourcePool::null; LLScriptResourceConsumer::LLScriptResourceConsumer() { } LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() { return LLScriptResourcePool::null; } const LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() const { return LLScriptResourcePool::null; } bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& new_pool) { return false; } bool LLScriptResourceConsumer::canUseScriptResourcePool(const LLScriptResourcePool& resource_pool) { return false; } bool LLScriptResourceConsumer::isInPool(const LLScriptResourcePool& resource_pool) { return false; } void LLScriptResourceConsumer::setScriptResourcePool(LLScriptResourcePool& pool) { } S32 LLTask::getUsedPublicURLs() const { return 0; } void LLTask::setScriptResourcePool(LLScriptResourcePool& pool) { }
2008-12-18Added Cmake test macrosDave Hiller
Changed simulator cmake to use the new macros