X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FTimerEvent.test.cc;h=d11cfca36787be889cf467cf8487ce757ee0f4ae;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=6a5704a7e17a16fe2e45f5947889c2463ff165e3;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Scheduler/TimerEvent.test.cc b/senf/Scheduler/TimerEvent.test.cc
index 6a5704a..d11cfca 100644
--- a/senf/Scheduler/TimerEvent.test.cc
+++ b/senf/Scheduler/TimerEvent.test.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -31,20 +31,20 @@
 #include "Scheduler.hh"
 #include <boost/bind.hpp>
 
-#include "../Utils//auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 #include <boost/random.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
     bool is_close(senf::ClockService::clock_type a, senf::ClockService::clock_type b)
     {
-        return (a<b ? b-a : a-b) < senf::ClockService::milliseconds(100);
+        return (a<b ? b-a : a-b) < senf::ClockService::milliseconds(50);
     }
-    
+
     bool called = false;
     void handler()
     {
@@ -53,13 +53,16 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(timerDispatcher)
+SENF_AUTO_UNIT_TEST(timerDispatcher)
 {
+    char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS"));
+    BOOST_WARN_MESSAGE(enabled, "Set SENF_TIMING_CRITICAL_TESTS to not skip timing critical tests");
+
     senf::scheduler::detail::FdManager::instance().timeout(1000);
 
     senf::ClockService::clock_type t (senf::ClockService::now());
     {
-        senf::scheduler::TimerEvent timer ("testTimer", &handler, 
+        senf::scheduler::TimerEvent timer ("testTimer", &handler,
                                            t + senf::ClockService::milliseconds(500));
         SENF_CHECK_NO_THROW( timer.disable() );
         SENF_CHECK_NO_THROW( timer.enable() );
@@ -68,7 +71,8 @@ BOOST_AUTO_UNIT_TEST(timerDispatcher)
         senf::ClockService::clock_type t2 (senf::ClockService::now());
         BOOST_CHECK( called );
         BOOST_CHECK( ! timer.enabled() );
-        BOOST_CHECK_PREDICATE( is_close, (t2-t)(senf::ClockService::milliseconds(500)) );
+        if (enabled)
+            BOOST_CHECK_PREDICATE( is_close, (t2-t)(senf::ClockService::milliseconds(500)) );
 
         called=false;
         t = senf::ClockService::now();
@@ -80,7 +84,8 @@ BOOST_AUTO_UNIT_TEST(timerDispatcher)
         SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().prepareRun() );
         SENF_CHECK_NO_THROW( senf::scheduler::detail::FIFORunner::instance().run() );
         SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().disable() );
-        BOOST_CHECK_PREDICATE( is_close, (t) (senf::ClockService::now()) );
+        if (enabled)
+            BOOST_CHECK_PREDICATE( is_close, (t) (senf::ClockService::now()) );
         BOOST_CHECK( called );
     }
 }
@@ -138,7 +143,7 @@ namespace {
                 "jitterTest::tm2", boost::bind(&jitterCb, boost::ref(tm2)), randomDelay());
         senf::scheduler::TimerEvent tm3 (
                 "jitterTest::tm3", boost::bind(&jitterCb, boost::ref(tm3)), randomDelay());
-        
+
         // enabled "Idle"-Event will degrade scheduling delay
         //senf::scheduler::TimerEvent idle (
         //        "jitterTest::idle", boost::bind(&idleCb, boost::ref(idle)), senf::scheduler::now());
@@ -153,7 +158,7 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(timerJitter)
+SENF_AUTO_UNIT_TEST(timerJitter)
 {
     senf::scheduler::watchdogTimeout(0);
     std::cerr << "Epoll timers\n";
@@ -164,9 +169,10 @@ BOOST_AUTO_UNIT_TEST(timerJitter)
     jitterTest();
     senf::scheduler::loresTimers();
     senf::scheduler::watchdogTimeout(1000);
+    BOOST_CHECK( true );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_