summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2016-12-09Merged in lindenlab/nat_viewer64 (pull request #6)nat_linden
DRTVWR-418: Change Mac build_directory to build-darwin-x86_64 since we no longer support 32-bit Mac builds.
2016-12-09increment minor version for p64 projectOz Linden
2016-12-09remove non-functional attempt to load llbase from the viewer tree; it is not ↵Oz Linden
there any more
2016-12-09move some cmake messages that are not warnings from stderr to stdoutOz Linden
2016-12-09Simplify version line in the About box, add address size to itOz Linden
2016-12-09add AUTOBUILD_ADDRSIZE to symbol file name for clarity, change output tag to ↵Oz Linden
just "Symbolfile"
2016-12-08DRTVWR-418: Change Mac build_directory to build-darwin-x86_64Nat Goodspeed
since we no longer support 32-bit Mac builds. The old build-darwin-i386 directory name appeared in a shocking number of files. Change CMake paths to use ${CMAKE_BINARY_DIR} -- or, when trying to find the packages subdirectory, ${AUTOBUILD_INSTALL_DIR}. Change the rest to at least look for build-darwin-*.
2016-12-07DRTVWR-418: Merge backout that restores llcorehttp tests.Nat Goodspeed
2016-12-07Backed out changeset fbcb5f5fb015: restore llcorehttp tests.Nat Goodspeed
2016-12-07DRTVWR-418: Overriding shutdown_request() wasn't the issue. Remove.Nat Goodspeed
2016-12-07merge changes for nats updates for llcorehttpOz Linden
2016-12-07merge changes for callums updatesOz Linden
2016-12-07Automated merge with ssh://bitbucket.org/lindenlab/viewer-skip-llcorehttp-testNat Goodspeed
2016-12-07DRTVWR-418: Apparently (some) Windows hosts still need freeport().Nat Goodspeed
This is the function in indra/llmessage/tests/testrunner.py that iterates through ports in a specified range, looking for an available one. Other platforms understand a specification of port 0 to mean: "You pick one. I'll just use whichever one you picked."
2016-12-07DRTVWR-418: Make testrunner.run() avoid extra Thread altogether.Nat Goodspeed
2016-12-07big hammer - temporarily disable llcorehttp tests completelyOz Linden
2016-12-07DRTVWR-418: Suppress llcorehttp tests until we solve TC harness issues.Nat Goodspeed
2016-12-07Automated merge with tip of lindenlab/oz_viewer64Callum Prentice
2016-12-07DRTVWR-418: Diagnostic prints to identify hangupNat Goodspeed
2016-12-07merge nats even newer fix for the llcorehttp testOz Linden
2016-12-07DRTVWR-418: Reinstate test that we THOUGHT was killing test run.Nat Goodspeed
But since the real problem is quite different, try with that suspected test restored.
2016-12-07DRTVWR-418: Fix a couple variable references in debugging output.Nat Goodspeed
2016-12-07DRTVWR-418: Revamp testrunner to shutdown server Thread at end.Nat Goodspeed
Instead of having testrunner.run()'s caller pass a Thread object on which to run the caller's server instance's serve_forever() method, just pass the server instance. testrunner.run() now constructs the Thread. This API change allows run() to also call shutdown() on the server instance when done, and then join() the Thread. The hope is that this will avoid the Python runtime forcing the process termination code to 1 due to forcibly killing the daemon thread still running serve_forever(). While at it, eliminate calls to testrunner.freeport() -- just make the runtime pick a suitable port instead.
2016-12-06DRTVWR-418: Remove duplicate testrunner.pyNat Goodspeed
2016-12-06pick up latest fixes from natOz Linden
2016-12-06automated merge with tip of lindenlab/viewer64Callum Prentice
2016-12-06merge fix for test runner failureOz Linden
2016-12-06DRTVWR-418: Fix minor error in forwarding shutdown_request() call.Nat Goodspeed
2016-12-06Fix minor error in forwarding shutdown_request() call.Nat Goodspeed
2016-12-06Try even harder to ignore errors in llcorehttp's dummy server.Nat Goodspeed
2016-12-06DRTVWR-418: Try harder to ignore errors in llcorehttp's dummy server.Nat Goodspeed
2016-12-06merge with feature to skip the (failing on TC) llcorehttp testCallum Prentice
2016-12-06Merge with fix to run packages-formatterCallum Prentice
2016-12-06DRTVWR-418: Skip the whole of the failing llcorehttp test function.Nat Goodspeed
2016-12-06merge skip of llcorehttp failing testOz Linden
2016-12-06DRTVWR-418: Skip the llcorehttp test that breaks test machinery.Nat Goodspeed
Loath though I am to skip testing, this consistent failure is not a failure in the software being tested (llcorehttp) but rather in the dummy server with which we're testing it.
2016-12-06DRTVWR-418: Run packages-formatter via Python interpreter for Windows.Nat Goodspeed
2016-12-06merge changes for latest fixes from natOz Linden
2016-12-06DRTVWR-418: Remove ThreadingMixin from our HTTPServer subclass.Nat Goodspeed
It's possible that raising an exception in a worker thread -- even though we're TRYING to suppress it -- is what's causing the process to terminate with nonzero rc.
2016-12-06DRTVWR-418: Set AUTOBUILD_ADDRSIZE for packages-formatter.py.Nat Goodspeed
This handles the case of building within an IDE, in which AUTOBUILD_ADDRSIZE isn't already set.
2016-12-06Automated merge with tip of lindenlab/viewer64Callum Prentice
2016-12-06DRTVWR-418: Try to clean up numerous CMake CMP0046 warnings.Nat Goodspeed
2016-12-06DRTVWR-418: Try for more llcorehttp tests error diagnostics.Nat Goodspeed
2016-12-05Automated merge with lindenlab/viewer64 (itself, merged from viewer-release ↵Callum Prentice
after bento/5.0 release)
2016-12-05merge changes for 5.0.0-releaseOz Linden
2016-12-05suppress VS linker warning about unfound pdb files in media pluginOz Linden
2016-12-05Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-12-05update copying of fmodex{64}.dll to right place for 32/64 bit buildsCallum Prentice
2016-12-05increment viewer version to 5.0.1Oz Linden
2016-12-05lower the verbosity of makensis to emit only warnings and errorsOz Linden