diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2008-12-18 01:30:09 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2008-12-18 01:30:09 +0000 |
| commit | 0a5c9731fd208dcd62b3c83e437b5d12adfc5605 (patch) | |
| tree | c260541815c7ce8f8d033a0cc27e43f4c55eef7f /indra/test/llhttpclient_tut.cpp | |
| parent | a8d88418ce8d716df2d7b7eb94af8a04c81cb1ca (diff) | |
Result of svn merge -r105061:106057 svn+ssh://svn/svn/user/phoenix/upgrade-tut into trunk. QAR-1074
Diffstat (limited to 'indra/test/llhttpclient_tut.cpp')
| -rw-r--r-- | indra/test/llhttpclient_tut.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp index 4ddea0f9cc..ddacbe0fa0 100644 --- a/indra/test/llhttpclient_tut.cpp +++ b/indra/test/llhttpclient_tut.cpp @@ -35,7 +35,7 @@ * */ -#include <tut/tut.h> +#include <tut/tut.hpp> #include "linden_common.h" // These are too slow on Windows to actually include in the build. JC @@ -345,7 +345,7 @@ namespace tut // won't ever let it run. Instead get from a known LLSD // source and compare results with the non-blocking get which // is tested against the mini server earlier. - skip_fail("secondlife.com is not reliable enough for unit tests."); + skip("secondlife.com is not reliable enough for unit tests."); LLSD expected; |