summaryrefslogtreecommitdiff
path: root/indra/test
AgeCommit message (Collapse)Author
2009-10-07Merged latest viewer/login-api with latest viewer/viewer-20brad kittenbrink
2009-10-05merge with latest from lindenlab/svn-imports-viewer-20Mark Palange (Mani)
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵James Cook
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-10#ifdef'd out gmock and gtest for LL_WINDOWS. Does not appear to be needed ↵Steve Linden
and breaks the build.
2009-09-09Merge with SVN viewer-2.0.0-3 branchBryan O'Sullivan
2009-09-09DEV-39537: Moved the toHTTPDateString tests into llhttpdate_tut.cpp,Martin Reddy
as a more appropriate home. Also made use of the skip() method rather than use printf() - thanks to tofu for the suggestion.
2009-09-08MergeBryan O'Sullivan
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-08Fix deprecated conversion from string constant to ‘char*’ warningsMartin Reddy
that occur under gcc 4.3 for DEV-39457. This fixes the indra/test C++ unit tests under Linux.
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-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
merged all changes, post copy, from the following branches: linden/brachnes/enable-o-v user/cg/qar-1538 user/mani/viewer2-enable-o-v
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-26Add llsd_equals(), a function whose absence sorely puzzles meNat Goodspeed
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
Ok, finally got this to a point where it doesn't break the build and I can check in. llcommon can be built as a shared library (disabled but can be enabled with cmake cache var LLCOMMON_LINK_SHARED. reviewed by Mani on tuesday (I still need to get his suggested changes re-reviewed)
2009-05-11svn merge -r113003:119136 ↵Nat Goodspeed
svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
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-04-07We must #include <cstring> for memcmp to be found reliably.Bryan O'Sullivan
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-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-25More build fixesBryan O'Sullivan
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
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-19Fixing tut related compile errors on etch:Andrew Meadows
(1) the LLLand class had to be forward declared in a cpp file that did not include llland.h (2) ensure_equals(const char*, type, type) requires that type have an operator!=(type, type) defined. (3) ensure_equals(const char*, type, type) is so overloaded that the compiler can have trouble picking the right version when it has to implicitly cast a std::string to "const char*" AND multiple valid casts exist for type --> S32, F32, etc. To solve this problem we must explicitly pass in a "const char*" instead of a std::string. Reviewed with CG
2008-12-18Result of svn merge -r105061:106057 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/upgrade-tut into trunk. QAR-1074
2008-12-04Merging from server/server-1.25 back to trunk.Robert Knop
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Conflicts resolved by Prospero, except for one scary conflict in SendConfirmationEmail.php which was resolved by jarv.
2008-12-01svn merge -r103586:104391 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-4-sandbox-r103546 Picking up the following bug fixes: DEV-19747 Flooding sim with bogus animation packets crashes sim DEV-20978 Investigate baked avatar texture caching in simulator - ids not properly stored DEV-5316 llsd-get .../runtime/top and "World:Region/Estate:Debug:Get Top Scripts" broken DEV-18807 SVC-2596: Script dataserver events become permanently blocked until sim restart DEV-19108 SVC-2616: Torus refuses to accept 180 degree texture rotation DEV-9944 Simulator crash failing to write simstate to file .tmp.tmp DEV-21439 Configure VFS file size via simulator.xml
2008-11-07Merged into release with command:Kartic Krishnamurthy
================================= svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge . QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally QA tested: Beast, Oskar DEV's fulfilled as part of this branch: ====================================== DEV-20842 Prevent accidental activation of DPO procs DEV-23028 Mac build fails - link error dual inclusion DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems DEV-22997 Xcode project: 'server' target has no dependencies DEV-23353 Friend request custom messages come through as an asset tag. DEV-23309 Voice Chat Indicator does not show active voice status DEV-23187 Can't teleport to home location
2008-10-10svn merge -r99056:99248 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
2008-10-01svn merge -r96886:98039 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
2008-09-29Result of svn merge -r97546:97641 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824
2008-09-23Re-enable blowfish tests on Darwin.Bryan O'Sullivan
2008-08-18fix for DEV-18488 - remove optimization for RelWithDebInfo for Darwin ↵Paul Oppenheim
builds. Not reviewed, mailed to cmake@. Pretty minor, not destructive. Also removing test lldatabase_tut on mac for DEV-14371 until theres a sane way to do connection checking. I could be wrong on this one.
2008-08-14svn merge -r 93885:94413 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release From 1.23: * DEV-18788 SEC-136: Avatars Link as links instead of sits * DEV-18754 Instant simulator crash using llUnescapeURL * QAR-780 Test the viewer crash reporter in branch crashlogger_vc8@92961 * login.cgi foo by billc * DEV-18732 QA the flow for first landing location change: Help Island + Browser Tutorial * Added email notification of crashloganalyzer.py failures * QAR-802 / DEV-19069 - merge maint-webds-1-23 to Branch_1-23-Server * removed obsolete start-location code Backport fixes from UPCOMING production branch: * DEV-19031 Crash in new Mono code when one object rezzes another with active script * DEV-19050 SVC-2745: llSetLinkPrimitiveParams misbehaving on 1.23 server if avatar is near ground * DEV-16129 Break getStartLocation timeout apart from rest of teleport request failure metric * DEV-14270 Add a column to tp metric to differentiate teleports, local teleports, and region_crossings * DEV-18965 Unable to save scripts when running a sim on windows. * DEV-17376 some region links in Search teleport you without warning * DEV-17796 Sim performance decreases a lot with rezzing physical objects * DEV-19142 SVC-2773: Mono Beta: Script editor "Save" does not save scripts containing syntax errors * Switched serialized data to a vector instead of a GCed Mono array * Made update of cache explicit * Added heartbeats during long derezzes and deletes to stop the launcher killing the sim * DEV-15010 include agent_id in search metrics * DEV-15011 Search metrics not including non 'CLASSIFIED' and 'PLACE' search types * DEV-19288 Broken webservices in 1.24 * DEV-18957 : SCUT : Enable test.py to run tests again a grid database * Remove leading whitespace to work around bug DEV - 19276 (this is NOT a fix for that bug) dataserver-is-deprecated-yo
2008-07-31svn merge -r93014:93396 ↵Dave Hiller
svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
2008-07-10QAR-622 merge -r91846:91877 svn+ssh://svn/svn/linden/branches/scut-newstyle-5Christian Goetze
2008-06-28svn merge -c 90839 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/tulla/file-move-merge
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 21:22:03 +0000