summaryrefslogtreecommitdiff
path: root/indra/test/CMakeLists.txt
AgeCommit message (Collapse)Author
2011-09-09Fixed indra test dynamic library issues.Logan Dethrow
2011-06-29Got indra/test to build. Fails to run due to missing .so files.Logan Dethrow
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-06-21Remove tab chars inherited with file...Nat Goodspeed
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.
2009-12-03Resync indra/test's LD_LIBRARY_PATH with ADD_INTEGRATION_TESTNat Goodspeed
2009-10-19mergeSteve Bennetts
2009-10-16merge from latest svn/viewer-2-0 to hg/viewer-2-0Mark Palange (Mani)
2009-10-16DEV-41408 convert lldependencies tut test to llcommon integration test.Adam Moss
2009-10-16DEV-41405 convert llxfer test to a llmessage integration test.Adam Moss
2009-10-16DEV-41404 convert monolithic tut llinventoryparcel test to llinventory ↵Adam Moss
integration test.
2009-10-16DEV-41403 convert reflection tut test to llcommon integration test.Adam Moss
2009-10-16DEV-41402 convert stringize tut test to llcommon integration test.Adam Moss
2009-10-15remove moved test from this CMakeLists.Adam Moss
2009-10-15DEV-41363 convert legacy llhost tut test into a llmessage integration test.Adam Moss
2009-10-15DEV-41355 convert llmime monolithic tut test to a llmessage unit test.Adam Moss
2009-10-15DEV-41354 convert llerror tut test into a llcommon integration testAdam Moss
2009-10-15DEV-41352 convert lluri tut test to a llcommon integration testAdam Moss
2009-10-15DEV-41345 turn llmodularmath_tut into a real llmath unit test.Adam Moss
2009-10-15DEV-41344 convert monolithic tut lltreeiterators test to a llcommon ↵Adam Moss
integration test.
2009-10-15DEV-41343 lljoint unit test - resurrected - this was previously disabled ↵Adam Moss
(and old-style monolithic tut)
2009-10-15DEV-41341 tut lltiming test -> llframetimer integration testAdam Moss
2009-10-12DEV-41178 convert lldate legacy monolithic tut test into a llcommon ↵Adam Moss
integration test.
2009-10-12DEV-41176 convert legacy inventory.cpp tut test into an llinventory ↵Adam Moss
integration test.
2009-10-12DEV-41175 convert legacy common.cpp tut test into llcommon integration test.Adam Moss
2009-10-12DEV-41174 more automated testing loveAdam Moss
* turn llnamevalue_tut into a llmessage unit test * turn llsdserialize_tut into a llcommon integration test * re-enable the (quite slow) llsdserialize test on win32 now that it doesn't have to run on every recompile * re-enable all llmessage unit tests on linux viewer builds
2009-10-08DEV-41090 convert legacy llrand tut test into a llcommon integration test.Adam Moss
2009-10-08DEV-41089 convert legacy tut llrect test into a llmath integration test.Adam Moss
2009-10-08DEV-41088 convert legacy 'math' test module into 'mathmisc' integration test.Adam Moss
2009-10-08repair the legacy tut test manifest.Adam Moss
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-08-31Merge with trunkBryan O'Sullivan
2009-08-11Add SHARED_LIB_STAGING_DIR to LD_LIBRARY_PATH for indra/test executable, as ↵Nat Goodspeed
with LLAddBuildTest
2009-07-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ↵brad kittenbrink
I'll need to rebuild that, plus a couple other minor clenaups.
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-28DEV-35399 - Making the server build llcommon.dll compatible.Mark Palange (Mani)
Now using RunBuildTest.cmake to run tut and lscript_lsl tests, inorder to set path to llcommon.dll Exported a few llcommon apis needed by server components/tests.
2009-07-15DEV-35500: Write new llmath unit testsMartin Reddy
- Added unit tests for LLRect and LLBBoxLocal in indra/test - Moved newview/LLBBox to llmath, and added unit tests for it - Removed methods in llbboxlocal.h and llbbox.h that were not actually implemented (declared in .h, but not defined in cpp) Reviewed by babbage.
2009-07-14QAR-1651Dave Hiller
svn merge -r126784:126785 svn+ssh://svn.lindenlab.com/svn/linden/branches/mock-3 into trunk
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-05-28DEV-32777: ensure that stack objects listening on persistent LLEventPumps getNat Goodspeed
properly disconnected when destroyed. Break out Debug class and associated macros from lleventcoro_test.cpp into test/debug.h. Add Debug output to lllogin_test.
2009-05-08svn merge -r114679:114681 ↵Nat Goodspeed
svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-7 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-8
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-03-02Clean up use of tutBryan O'Sullivan
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) { }
2009-02-24merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunkKelly Washington
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18svn merge -c 112301 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/sim-ao/sim-ao-4 propagate bandaid for DEV-27390
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 04:11:26 +0000