# HG changeset patch # User Mathieu Lacage # Date 1232049334 -3600 # Node ID 4b919c166ec3eb23bdf1ea76a361229e5c0d77b8 # Parent 7d5024b3f882b2fba3db439c45f7b72292d019bc test calendar+ns2calendar schedulers diff -r 7d5024b3f882 -r 4b919c166ec3 src/simulator/simulator.cc --- a/src/simulator/simulator.cc Thu Jan 15 20:54:11 2009 +0100 +++ b/src/simulator/simulator.cc Thu Jan 15 20:55:34 2009 +0100 @@ -316,6 +316,8 @@ #include "list-scheduler.h" #include "heap-scheduler.h" #include "map-scheduler.h" +#include "calendar-scheduler.h" +#include "ns2-calendar-scheduler.h" namespace ns3 { @@ -742,6 +744,20 @@ } Simulator::Destroy (); + Simulator::SetScheduler (CreateObject ()); + if (!RunOneTest ()) + { + result = false; + } + Simulator::Destroy (); + + Simulator::SetScheduler (CreateObject ()); + if (!RunOneTest ()) + { + result = false; + } + Simulator::Destroy (); + Simulator::Schedule (Seconds (0.0), &foo0); Simulator::Schedule (Seconds (0.0), &foo1, 0); Simulator::Schedule (Seconds (0.0), &foo2, 0, 0);