Commit Graph

215 Commits (ce5baf14ac62ecd3bf471e1b49a4e166310ebe1a)

Author SHA1 Message Date
Graham Linden 2a03e8f9fb MAINT-3172 fix rendering regressions from release mergedown 2013-09-20 16:44:39 -07:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Graham Madarasz e1c1428569 Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial 2013-05-11 20:38:23 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Nat Goodspeed b7235f1a44 MAINT-2612: Remove no-longer-valid unused-var warning suppressions.
Somehow viewer-cat acquired a lot of source lines (in several different files)
of the form:
    (void)somevar;
where ?somevar? was not declared. Apparently someone introduced an unused
declaration of ?somevar?, encountered unused-variable warnings, introduced the
(void) casts to suppress those warnings, then deleted the declarations --
without deleting the (void) casts. It seems worth noting that the resulting
code should not have compiled successfully on any platform.
2013-04-22 14:35:07 -04:00
Oz Linden 3bb708d706 merge up to latest viewer-development for merge to 3.5.2 2013-04-19 14:42:56 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Oz Linden 327c99cadb merge up to 3.5.2 development 2013-04-16 16:01:32 -04:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Graham Madarasz e8b8a12b73 Mods to make compile on gcc 4.6.3 work mo betta 2013-03-12 10:48:05 -07:00
prep 46ab23c94b llinventory merge fixes 2013-03-11 18:02:16 -04:00
Oz Linden 8bb3d0891d merge up to 3.4.5-release 2013-02-12 13:27:03 -05:00
Oz Linden 19233999ed disable timing sensitive check in the pipe and pump fitness test 2013-01-31 09:34:00 -05:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Oz Linden a7dbaaa0af merge changes for DRTVWR-250 2013-01-08 09:45:27 -05:00
Nat Goodspeed 8a2c30b388 MAINT-1986: in TeamCity, do not reload saved hashmap_test data.
Rev b7fd7c95c571 allows a developer to debug a failure in hashmap_test 1. Once
the test fails, rerunning that test will replay the same failure to try to
permit debugging it. But that behavior is extremely undesirable under
TeamCity! In a TeamCity run, don't even check for saved data file.
2012-12-19 06:40:44 -05:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
Oz Linden 08cbabdcc0 disable tests that fail too often on Windows 2013-02-13 14:20:45 -05:00
Oz Linden 5ade41c09d disable timing sensitive check in the pipe and pump fitness test 2013-01-31 09:34:00 -05:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Nat Goodspeed e97c06cf0c On lluuidhashmap_tut<1> failure, save/reload data in temp file.
Generating new random data on every test run makes it impossible to debug a
test failure. While in general we do want to generate random data to
thoroughly exercise the generator logic, if every new run generates new data,
the only thing we can do about an observed failure is shrug and ignore it. Add
logic to save data on failure, with corresponding logic to notice and reload
from a previously-generated save file.
In case of a merge collision, this version SUPERCEDES my previous efforts with
this file. (My other changes may still be in a backed-up merge request.) It is
okay to resolve collisions in favor of this version.
2012-10-10 10:45:37 -04:00
Don Kjer 7153d1db11 Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable 2012-09-20 04:29:17 +00:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Oz Linden 5c2c85c6f7 integrate Nats improvements to test logging with mine 2012-06-26 09:41:35 -04:00
Oz Linden 0f958faacd merge up to 3.3.3-release + pathfinding 2012-06-25 17:16:29 -04:00
Oz Linden f92e7d30a8 Add logging during tests (debug level, to test-specific files) 2012-06-24 07:27:34 -04:00
Oz Linden 6abcd55b50 merge changes for DRTVWR-162 2012-06-08 11:41:10 -04:00
Nat Goodspeed 89ea7ccfc7 Automated merge with file:///Users/nat/linden/viewer-maint-1144 2012-06-06 23:21:07 -04:00
Nat Goodspeed cd05a244da MAINT-1144: Break out llhttpclient_tut as standalone integration test.
indra/test/llhttpclient_tut.cpp ==> indra/llmessage/tests/llhttpclient_test.cpp,
with corresponding CMakeLists.txt changes in their respective directories.
This first commit merely moves the test source file without changing it --
separating out moves from edits simplifies code review.
2012-06-06 19:57:58 -04:00
Nat Goodspeed da6c5fbf7f MAINT-1144: Unblock build for previous commit.
Today, 2012-06-06, LLHTTPClient::get("http://www.google.com/") has stopped
working. This is unrelated to viewer code changes: it crosses repo boundaries.
Skip the afflicted tests to get builds working until we can recast the tests
to avoid the flaky dependency.
2012-06-06 19:05:51 -04:00
Nat Goodspeed 95a147dea7 CHOP-900: Fix test.cpp merge errors merging up to viewer-release 2012-05-09 23:03:37 -04:00
Nat Goodspeed a5b0147df4 Automated merge with http://hg.secondlife.com/viewer-release 2012-05-09 22:33:04 -04:00
Nat Goodspeed eb1bea2223 IQA-463: LLError::addRecorder() claims ownership of passed Recorder*.
That is, when the underlying LLError::Settings object is destroyed -- possibly
at termination, possibly on LLError::restoreSettings() -- the passed Recorder*
is deleted.
There was much existing code that seemed as unaware of this alarming fact as I
was myself. Passing to addRecorder() a pointer to a stack object, or to a
member of some other object, is just Bad. It might be preferable to make
addRecorder() accept std::auto_ptr<Recorder> to make the ownership transfer
more explicit -- or even boost::shared_ptr<Recorder> instead, which would
allow the caller to either forget or retain the passed Recorder.
This preliminary pass retains the Recorder* dumb pointer API, but documents
the ownership issue, and eliminates known instances of passing pointers to
anything but a standalone heap Recorder subclass object.
2012-04-23 11:26:18 -04:00
Nat Goodspeed f02ded46fe Make test.cpp support LOGFAIL env var: only failed tests show log.
Set LOGFAIL= one of ALL, DEBUG, INFO, WARN, ERROR, NONE. A passing test will
run silently, as now; but a failing test will replay log output at the
specified level or higher.
While at it, support LOGTEST environment variable, same values. This is like
setting --debug (or -d), but allows specifying an arbitrary level -- and,
unlike --debug, can be set for a TeamCity build config without modifying any
scripts or code.
Publish LLError::decodeLevel(std::string), previously private to llerror.cpp.
2012-03-05 13:07:14 -05:00
Nat Goodspeed c8032de94e Add NamedExtTempFile to invent arbitrary name with specified ext.
This arises, for instance, if you want to be able to create a temporary Python
module you can import from test scripts. The Python module file MUST have the
.py extension.
2012-03-01 14:37:41 -05:00
Nat Goodspeed 5adc39753b Update llevents_tut.cpp to use StringVec, not local StringList. 2012-02-24 16:02:39 -05:00
Nat Goodspeed 10ab4adc86 Fix llprocess_test.cpp's exception catching for Linux.
In the course of re-enabling the indra/test tests last year, Log generalized a
workaround I'd introduced in llsdmessage_test.cpp. In Linux viewer land, a
test program trying to catch an expected exception can't seem to catch it by
its specific class (across the libllcommon.so boundary), but must instead
catch std::runtime_error and validate the typeid().name() string. Log added a
macro for this idiom in llevents_tut.cpp. Generalize that macro further for
normal-case processing as well, move it to a header file of its own and use it
in all known places -- plus the new exception-catching tests in
llprocess_test.cpp.
2012-02-15 13:44:43 -05:00
Nat Goodspeed 0fe14d9d70 Echo group_started, group_completed to test-program output file.
This isn't recent oversight; in viewer-development the output file never
contained those lines either. But it should.
Using scoped_ptr is more robust than using a dumb pointer with inline "Oh
yeah, don't forget to clean up that pointer" logic.
2012-02-08 10:33:46 -05:00
Nat Goodspeed 2681d5403c Automated merge with file:C%3A%5CUsers%5CNat%5Clinden%5Cviewer-tut-fix 2012-02-07 14:31:27 -05:00
Nat Goodspeed 33a42b32ca Disable MSVC warning C4702 (unreachable code) in Boost headers. 2012-02-07 13:06:38 -05:00
Nat Goodspeed d99acd56cd ManageAPR should be noncopyable. Make that explicit.
Any RAII class should either be noncopyable or should deal appropriately with
a copy operation. ManageAPR is intended only for extremely simple cases, and
hence should be noncopyable.
2012-02-06 17:06:55 -05:00
Nat Goodspeed f65028e38e Automated merge with file:///Users/nat/linden/viewer-tut-fix 2012-02-03 13:11:04 -05:00
Nat Goodspeed 90ba675da4 Escape all strings embedded in TeamCity service messages.
TeamCity requires that certain characters (notably "'") must be escaped when
embedded in service messages:
http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity#BuildScriptInteractionwithTeamCity-ServiceMessages
TUT frequently outputs messages containing "'", e.g. from ensure_equals()
failure. We've seen TC output nesting get confused when it fails to process
service messages properly due to parsing unescaped messages.
Along with test<n> number, report test name (from set_test_name()) when
available.
Eliminate horsing around to produce normal output on both std::cout and
possible output file. When output file is specified, use
boost::iostreams::tee_device to do fanout for us.
Improve placement (and possibly reliability) of service messages.
Clean up a startling amount of redundancy in service-message production.
2012-02-03 13:09:20 -05:00
Nat Goodspeed 51b26cab9a Any proper RAII class must either handle copying or be noncopyable.
NamedTempFile makes no attempt to deal with copying, therefore make it
noncopyable.
2012-01-17 20:30:46 -05:00
Nat Goodspeed a01dd3549c Make NamedTempFile::peep() a public member for debugging unit tests. 2012-01-17 18:40:05 -05:00