Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 27, 2015, 11:08:26 PM (10 years ago)
Author:
landauf
Message:

moved Scope and ScopedSingletonManager from util to core.
TODO I had to disable two tests in ScopeTest.cc because now that it runs in the core library, there are too many singletons which get loaded in graphics scope (with too many dependencies). this should be fixed

Location:
code/branches/core7/test/core
Files:
1 added
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • code/branches/core7/test/core/CMakeLists.txt

    r10363 r10407  
    2828    object/SmartPtrTest.cc
    2929    object/WeakPtrTest.cc
     30    singleton/ScopeTest.cc
    3031)
    3132ADD_DEPENDENCIES(all_tests core_test)
  • code/branches/core7/test/core/singleton/ScopeTest.cc

    r10406 r10407  
    11#include <gtest/gtest.h>
    2 #include "util/ScopedSingletonManager.h"
     2#include "core/singleton/ScopedSingletonManager.h"
    33
    44namespace orxonox
     
    4343    }
    4444
    45     TEST(Scope, RootAndGraphicsScope)
     45    TEST(DISABLED_Scope, RootAndGraphicsScope)
    4646    {
    4747        EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
     
    6868    }
    6969
    70     TEST(Scope, RootAndGraphicsSingleton)
     70    TEST(DISABLED_Scope, RootAndGraphicsSingleton)
    7171    {
    7272        EXPECT_FALSE(TestSingletonGraphics::exists());
Note: See TracChangeset for help on using the changeset viewer.