X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FScheduler.test.cc;h=cb63710dd82f9c7d9b933667ee784cb18a63748e;hb=94e4eda4358a4def564175ae42173f91307e36a4;hp=3a1b3ba704342e1e79e6b421e7b742f1cf4a935d;hpb=61512a4b2d212696b96ed73009b36665c8c637ed;p=senf.git

diff --git a/senf/Scheduler/Scheduler.test.cc b/senf/Scheduler/Scheduler.test.cc
index 3a1b3ba..cb63710 100644
--- a/senf/Scheduler/Scheduler.test.cc
+++ b/senf/Scheduler/Scheduler.test.cc
@@ -44,7 +44,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
@@ -74,7 +74,7 @@ namespace {
         int conn = accept(sock,0,0);
         if (conn < 0) fail("accept");
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-/////////////////////////////////////////////////////////////////////////////////////////
 
         if (write(conn,"READ",4)<0) fail("write");
         char buffer[1024];
@@ -89,7 +89,7 @@ namespace {
         } else
             if (write(conn,"FAIL",4)<0) fail("write");
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-/////////////////////////////////////////////////////////////////////////////////////////
 
         close(conn);
         close(sock);
@@ -189,7 +189,7 @@ namespace {
     {
         return (a<b ? b-a : a-b) < senf::ClockService::milliseconds(100);
     }
-    
+
     senf::ClockService::clock_type sigtime (0);
 
     void sigusr(siginfo_t const &)
@@ -243,7 +243,7 @@ void schedulerTest()
         BOOST_FAIL("connect");
     }
 
-    ///////////////////////////////////////////////////////////////////////////
+    //-/////////////////////////////////////////////////////////////////////////////////////////////
 
     senf::scheduler::EventHook evev ("eventCounter", eventeventhandler,
                                      senf::scheduler::EventHook::PRE);
@@ -276,13 +276,13 @@ void schedulerTest()
         buffer[size]=0;
         BOOST_CHECK_EQUAL( buffer, "OK" );
     }
-    
+
     {
-        senf::scheduler::TimerEvent timer1 ("testTimer1", &timeout, 
+        senf::scheduler::TimerEvent timer1 ("testTimer1", &timeout,
                                             senf::ClockService::now()+senf::ClockService::milliseconds(200));
         senf::scheduler::TimerEvent timer2 ("testTimer2", &timeout,
                                             senf::ClockService::now()+senf::ClockService::milliseconds(400));
-                                            
+
         event = senf::scheduler::FdEvent::EV_NONE;
         senf::ClockService::clock_type t (senf::ClockService::now());
         SENF_CHECK_NO_THROW( senf::scheduler::process() );
@@ -316,31 +316,31 @@ void schedulerTest()
         senf::ClockService::clock_type t = senf::ClockService::now();
         ::kill(::getpid(), SIGUSR1);
         delay(200);
-        SENF_CHECK_NO_THROW( senf::scheduler::process() ); 
+        SENF_CHECK_NO_THROW( senf::scheduler::process() );
         if (enabled) {
             BOOST_CHECK_PREDICATE( is_close, (senf::ClockService::now()) (t+senf::ClockService::milliseconds(200)) );
             BOOST_CHECK_PREDICATE( is_close, (sigtime) (t+senf::ClockService::milliseconds(200)) );
         }
-        SENF_CHECK_NO_THROW( senf::scheduler::process() ); 
-    } 
+        SENF_CHECK_NO_THROW( senf::scheduler::process() );
+    }
 
     BOOST_CHECK( eventCount >= 8u );
 
- 
-    ///////////////////////////////////////////////////////////////////////////
+
+    //-/////////////////////////////////////////////////////////////////////////////////////////////
 
     close(sock);
 
     BOOST_CHECK (stop_server(pid));
 }
 
-BOOST_AUTO_UNIT_TEST(testSchedulerPollTimers)
+SENF_AUTO_UNIT_TEST(testSchedulerPollTimers)
 {
     BOOST_CHECK( ! senf::scheduler::usingHiresTimers() );
     schedulerTest();
 }
 
-BOOST_AUTO_UNIT_TEST(testSchedulerHiresTimers)
+SENF_AUTO_UNIT_TEST(testSchedulerHiresTimers)
 {
     if (senf::scheduler::haveScalableHiresTimers())
         BOOST_MESSAGE( "Using timerfd() hires timers" );
@@ -353,7 +353,7 @@ BOOST_AUTO_UNIT_TEST(testSchedulerHiresTimers)
     BOOST_CHECK( ! senf::scheduler::usingHiresTimers() );
 }
 
-BOOST_AUTO_UNIT_TEST(testSchedulerPOSIXTimers)
+SENF_AUTO_UNIT_TEST(testSchedulerPOSIXTimers)
 {
     if (senf::scheduler::haveScalableHiresTimers()) {
         SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().timerSource(
@@ -365,7 +365,7 @@ BOOST_AUTO_UNIT_TEST(testSchedulerPOSIXTimers)
 }
 
 namespace {
-    
+
     void sigme()
     {
         senf::scheduler::BlockSignals signalBlocker;
@@ -381,7 +381,7 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(blockSignals)
+SENF_AUTO_UNIT_TEST(blockSignals)
 {
     char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS"));
     BOOST_WARN_MESSAGE(enabled, "Set SENF_TIMING_CRITICAL_TESTS to not skip timing critical tests");
@@ -390,21 +390,21 @@ BOOST_AUTO_UNIT_TEST(blockSignals)
     senf::scheduler::TimerEvent timer (
         "testWatchdog", &timeout, senf::ClockService::now()+senf::ClockService::milliseconds(400));
     senf::scheduler::SignalEvent sig (SIGUSR1, &sigusr);
-    
+
     senf::ClockService::clock_type t = senf::ClockService::now();
-    SENF_CHECK_NO_THROW( senf::scheduler::process() ); 
+    SENF_CHECK_NO_THROW( senf::scheduler::process() );
 
     if (enabled) {
-        BOOST_CHECK_PREDICATE( is_close, 
-                               (senf::ClockService::now()) 
+        BOOST_CHECK_PREDICATE( is_close,
+                               (senf::ClockService::now())
                                (t+senf::ClockService::milliseconds(200)) );
         BOOST_CHECK_PREDICATE( is_close, (sigtime) (t+senf::ClockService::milliseconds(200)) );
     }
 
-    SENF_CHECK_NO_THROW( senf::scheduler::process() ); 
+    SENF_CHECK_NO_THROW( senf::scheduler::process() );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_