diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-07 17:57:40 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-07 17:57:40 -0500 |
| commit | 6cd487d33bb85ee62e77ae408c0bea60f53a335b (patch) | |
| tree | f360acf8e14e3c685d45f44d2cf188986bc4cb0c /indra/viewer_components/login | |
| parent | 209a660f08c9278166b94750cbb2c3e2a2ee15a9 (diff) | |
| parent | e5eba40869cc1f99d847125a4836d496018ccad7 (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/viewer_components/login')
| -rw-r--r-- | indra/viewer_components/login/tests/lllogin_test.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp index 6255f7ed15..69a8424e87 100644 --- a/indra/viewer_components/login/tests/lllogin_test.cpp +++ b/indra/viewer_components/login/tests/lllogin_test.cpp @@ -29,6 +29,20 @@ #include "llevents.h" #include "stringize.h" +#if LL_WINDOWS +#define skipwin(arg) skip(arg) +#define skipmac(arg) +#define skiplinux(arg) +#elif LL_DARWIN +#define skipwin(arg) +#define skipmac(arg) skip(arg) +#define skiplinux(arg) +#elif LL_LINUX +#define skipwin(arg) +#define skipmac(arg) +#define skiplinux(arg) skip(arg) +#endif + /***************************************************************************** * Helper classes *****************************************************************************/ @@ -231,7 +245,6 @@ namespace tut ensure_equals("Online state", listener.lastEvent()["state"].asString(), "online"); } - /* template<> template<> void llviewerlogin_object::test<2>() { @@ -417,7 +430,6 @@ namespace tut ensure_equals("Failed to offline", listener.lastEvent()["state"].asString(), "offline"); } - *FIX:Mani Disabled unit boost::coro is patched template<> template<> void llviewerlogin_object::test<5>() { @@ -453,5 +465,4 @@ namespace tut ensure_equals("SRV Failure", listener.lastEvent()["change"].asString(), "fail.login"); } -*/ } |