Oz Linden
4eca1769e9
merge changes for nats updates for llcorehttp
2016-12-07 19:15:33 -05:00
Oz Linden
97e83f7dfb
merge changes for callums updates
2016-12-07 18:23:35 -05:00
Oz Linden
54f1f81d5a
comment out building the tpv distro for llphysicsextensions to unblock others
2016-12-07 18:22:34 -05:00
Nat Goodspeed
6dd0a500ea
Automated merge with ssh://bitbucket.org/lindenlab/viewer-skip-llcorehttp-test
2016-12-07 16:06:32 -05:00
Nat Goodspeed
5bb456d80c
DRTVWR-418: Apparently (some) Windows hosts still need freeport().
...
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-07 14:10:32 -05:00
Oz Linden
c89c1e5f61
correct paths for building llphysicsextensions_tpv package
2016-12-07 14:09:20 -05:00
Nat Goodspeed
54f95e4d61
DRTVWR-418: Make testrunner.run() avoid extra Thread altogether.
2016-12-07 13:25:42 -05:00
Oz Linden
07a36b1da4
big hammer - temporarily disable llcorehttp tests completely
2016-12-07 11:51:42 -05:00
Nat Goodspeed
0a9794398c
DRTVWR-418: Suppress llcorehttp tests until we solve TC harness issues.
2016-12-07 11:48:20 -05:00
Callum Prentice
70a42af076
Automated merge with tip of lindenlab/oz_viewer64
2016-12-07 08:43:51 -08:00
Nat Goodspeed
2569a1701d
DRTVWR-418: Diagnostic prints to identify hangup
2016-12-07 10:20:06 -05:00
Oz Linden
232c359854
merge nats even newer fix for the llcorehttp test
2016-12-07 10:09:58 -05:00
Nat Goodspeed
0532e298a0
DRTVWR-418: Reinstate test that we THOUGHT was killing test run.
...
But since the real problem is quite different, try with that suspected test
restored.
2016-12-07 10:05:24 -05:00
Nat Goodspeed
e1482838fe
DRTVWR-418: Fix a couple variable references in debugging output.
2016-12-07 09:44:55 -05:00
Nat Goodspeed
a4ba22fecc
DRTVWR-418: Revamp testrunner to shutdown server Thread at end.
...
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-07 09:30:49 -05:00
Nat Goodspeed
e1b0317c04
DRTVWR-418: Remove duplicate testrunner.py
2016-12-06 19:44:57 -05:00
Oz Linden
86bd3ffa47
pick up latest fixes from nat
2016-12-06 17:33:23 -05:00
Callum Prentice
15c043ec20
automated merge with tip of lindenlab/viewer64
2016-12-06 13:33:10 -08:00
Oz Linden
0d4f1adc1e
merge fix for test runner failure
2016-12-06 16:31:07 -05:00
Nat Goodspeed
40b1913af3
DRTVWR-418: Fix minor error in forwarding shutdown_request() call.
2016-12-06 16:20:43 -05:00
Nat Goodspeed
43c9a7d706
Fix minor error in forwarding shutdown_request() call.
2016-12-06 16:19:32 -05:00
Nat Goodspeed
e47b178fb9
Try even harder to ignore errors in llcorehttp's dummy server.
2016-12-06 16:09:26 -05:00
Nat Goodspeed
4aae3e8eb4
DRTVWR-418: Try harder to ignore errors in llcorehttp's dummy server.
2016-12-06 16:07:05 -05:00
Callum Prentice
bf4dd33c46
merge with feature to skip the (failing on TC) llcorehttp test
2016-12-06 13:00:26 -08:00
Callum Prentice
476f5496bb
Merge with fix to run packages-formatter
2016-12-06 13:00:16 -08:00
Nat Goodspeed
4c89e6dea0
DRTVWR-418: Skip the whole of the failing llcorehttp test function.
2016-12-06 15:38:31 -05:00
Oz Linden
adf74f8ced
merge skip of llcorehttp failing test
2016-12-06 14:58:06 -05:00
Nat Goodspeed
8948c4f001
DRTVWR-418: Skip the llcorehttp test that breaks test machinery.
...
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-06 14:22:42 -05:00
Nat Goodspeed
199d3c5675
DRTVWR-418: Run packages-formatter via Python interpreter for Windows.
2016-12-06 13:25:53 -05:00
Oz Linden
26e1f59dcb
pull in hack to comment out llcorehttp_test
2016-12-06 13:07:48 -05:00
Oz Linden
f43768414d
comment out llcorehttp_test until it can be debugged again
2016-12-06 13:07:10 -05:00
Oz Linden
59f2055c8d
merge changes for latest fixes from nat
2016-12-06 12:22:55 -05:00
Nat Goodspeed
780120dc46
DRTVWR-418: Remove ThreadingMixin from our HTTPServer subclass.
...
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-06 12:19:01 -05:00
Nat Goodspeed
bae76ec8df
DRTVWR-418: Set AUTOBUILD_ADDRSIZE for packages-formatter.py.
...
This handles the case of building within an IDE, in which AUTOBUILD_ADDRSIZE
isn't already set.
2016-12-06 11:48:43 -05:00
Callum Prentice
be04be3455
Automated merge with tip of lindenlab/viewer64
2016-12-06 08:23:05 -08:00
Nat Goodspeed
e6b9174bba
DRTVWR-418: Try to clean up numerous CMake CMP0046 warnings.
2016-12-06 09:50:05 -05:00
Nat Goodspeed
e9a9e3d4ba
DRTVWR-418: Try for more llcorehttp tests error diagnostics.
2016-12-06 09:32:36 -05:00
Mnikolenko Productengine
391db15f85
MAINT-6963 Object's name is not changed in inventory if object in attached state was renamed through Edit floater.
2016-12-06 13:25:26 +02:00
Callum Prentice
3c16beedc0
Automated merge with lindenlab/viewer64 (itself, merged from viewer-release after bento/5.0 release)
2016-12-05 15:49:26 -08:00
Oz Linden
295a4c63b4
merge changes for 5.0.0-release
2016-12-05 17:40:04 -05:00
Oz Linden
2d8ad89f33
suppress VS linker warning about unfound pdb files in media plugin
2016-12-05 17:32:38 -05:00
Nat Goodspeed
05d58c91ef
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-12-05 17:01:38 -05:00
Callum Prentice
2337134497
update autobuild substitutions with {var} form
2016-12-05 13:58:14 -08:00
Callum Prentice
004cd151ff
update copying of fmodex{64}.dll to right place for 32/64 bit builds
2016-12-05 12:24:00 -08:00
Callum Prentice
011d07f1e3
Pull in 64 bit version of vlc-bin for 64 bit viewer builds
2016-12-05 12:22:36 -08:00
Oz Linden
c21571474c
merge changes for 5.0.0-release
2016-12-05 15:20:27 -05:00
Oz Linden
8a67aaa009
limit variants to RelWithDebInfo and Release
2016-12-05 15:20:08 -05:00
AndreyL ProductEngine
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
Oz Linden
68413474c4
increment viewer version to 5.0.1
2016-12-05 14:16:56 -05:00
Oz Linden
a9758daa34
Added tag 5.0.0-release for changeset b41e1e7c7876
2016-12-05 14:16:55 -05:00