diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-01-23 04:10:40 -0800 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-01-23 04:10:40 -0800 |
| commit | 60727c97f430cd392bba1f9122dc0fa8de48005f (patch) | |
| tree | 36ea1c0c5cd0fa1bc43b8a8aca77af495f7fc0bc /indra/newview/tests | |
| parent | c301db972e975dabe96f6e70c27aa07b0bf51b1f (diff) | |
| parent | c93648e3d2a5a70a6fc8c0de46d45580798b0386 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-tools-update
Diffstat (limited to 'indra/newview/tests')
| -rwxr-xr-x | indra/newview/tests/lllogininstance_test.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index 9ee6403739..1b0334498e 100755 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -193,14 +193,6 @@ void LLAppViewer::forceQuit(void) {} LLAppViewer * LLAppViewer::sInstance = 0; //----------------------------------------------------------------------------- -#include "llnotificationsutil.h" -LLNotificationPtr LLNotificationsUtil::add(const std::string& name, - const LLSD& substitutions, - const LLSD& payload, - boost::function<void (const LLSD&, const LLSD&)> functor) { return LLNotificationPtr((LLNotification*)0); } - - -//----------------------------------------------------------------------------- #include "llupdaterservice.h" std::string const & LLUpdaterService::pumpName(void) @@ -488,8 +480,6 @@ namespace tut template<> template<> void lllogininstance_object::test<3>() { - skip("test fails with Xcode 6, skipping"); - set_test_name("Test Mandatory Update User Accepts"); // Part 1 - Mandatory Update, with User accepts response. @@ -517,8 +507,6 @@ namespace tut template<> template<> void lllogininstance_object::test<4>() { - skip("test fails with Xcode 6, skipping"); - set_test_name("Test Mandatory Update User Decline"); // Test connect with update needed. |