--- a/src/test/csma-system-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
+++ b/src/test/csma-system-test-suite.cc	Mon Jan 17 12:53:20 2011 -0800
@@ -58,7 +58,7 @@
   virtual ~CsmaBridgeTestCase ();
 
 private:
-  virtual bool DoRun (void);
+  virtual void DoRun (void);
   void SinkRx (Ptr<const Packet> p, const Address &ad);
   uint32_t m_count;
 };
@@ -91,7 +91,7 @@
 //
 // - CBR/UDP test flow from n0 to n1; test that packets received on n1 
 //
-bool
+void
 CsmaBridgeTestCase::DoRun (void)
 {
   NodeContainer terminals;
@@ -155,8 +155,6 @@
 
   // We should have sent and received 10 packets
   NS_TEST_ASSERT_MSG_EQ (m_count, 10, "Bridge should have passed 10 packets");
-
-  return GetErrorStatus ();
 }
 
 class CsmaBroadcastTestCase : public TestCase
@@ -166,7 +164,7 @@
   virtual ~CsmaBroadcastTestCase ();
 
 private:
-  virtual bool DoRun (void);
+  virtual void DoRun (void);
   void SinkRxNode1 (Ptr<const Packet> p, const Address &ad);
   void SinkRxNode2 (Ptr<const Packet> p, const Address &ad);
   void DropEvent (Ptr<const Packet> p);
@@ -216,7 +214,7 @@
 //   n0 originates UDP broadcast to 255.255.255.255/discard port, which 
 //   is replicated and received on both n1 and n2
 //
-bool
+void
 CsmaBroadcastTestCase::DoRun (void)
 {
   NodeContainer c;
@@ -279,8 +277,6 @@
   // We should have sent and received 10 packets
   NS_TEST_ASSERT_MSG_EQ (m_countNode1, 10, "Node 1 should have received 10 packets");
   NS_TEST_ASSERT_MSG_EQ (m_countNode2, 10, "Node 2 should have received 10 packets");
-
-  return GetErrorStatus ();
 }
 
 class CsmaMulticastTestCase : public TestCase
@@ -290,7 +286,7 @@
   virtual ~CsmaMulticastTestCase ();
 
 private:
-  virtual bool DoRun (void);
+  virtual void DoRun (void);
   void SinkRx (Ptr<const Packet> p, const Address &ad);
   void DropEvent (Ptr<const Packet> p);
   uint32_t m_count;
@@ -334,7 +330,7 @@
 // - Nodes n0, n1, n2, n3, and n4 receive the multicast frame.
 // - Node n4 listens for the data 
 //
-bool
+void
 CsmaMulticastTestCase::DoRun (void)
 {
   //
@@ -443,8 +439,6 @@
 
   // We should have sent and received 10 packets
   NS_TEST_ASSERT_MSG_EQ (m_count, 10, "Node 4 should have received 10 packets");
-
-  return GetErrorStatus ();
 }
 
 class CsmaOneSubnetTestCase : public TestCase
@@ -454,7 +448,7 @@
   virtual ~CsmaOneSubnetTestCase ();
 
 private:
-  virtual bool DoRun (void);
+  virtual void DoRun (void);
   void SinkRxNode0 (Ptr<const Packet> p, const Address &ad);
   void SinkRxNode1 (Ptr<const Packet> p, const Address &ad);
   void DropEvent (Ptr<const Packet> p);
@@ -501,7 +495,7 @@
 // - CBR/UDP flows from n0 to n1 and from n3 to n0
 // - DropTail queues 
 //
-bool
+void
 CsmaOneSubnetTestCase::DoRun (void)
 {
   NodeContainer nodes;
@@ -575,8 +569,6 @@
   // We should have sent and received 10 packets
   NS_TEST_ASSERT_MSG_EQ (m_countNode0, 10, "Node 0 should have received 10 packets");
   NS_TEST_ASSERT_MSG_EQ (m_countNode1, 10, "Node 1 should have received 10 packets");
-
-  return GetErrorStatus ();
 }
 
 class CsmaPacketSocketTestCase : public TestCase
@@ -586,7 +578,7 @@
   virtual ~CsmaPacketSocketTestCase ();
 
 private:
-  virtual bool DoRun (void);
+  virtual void DoRun (void);
   void SinkRx (std::string path, Ptr<const Packet> p, const Address &address);
   void DropEvent (Ptr<const Packet> p);
   uint32_t m_count;
@@ -626,7 +618,7 @@
 // -- We will test reception at node n0
 // - Default 512 byte packets generated by traffic generator
 //
-bool
+void
 CsmaPacketSocketTestCase::DoRun (void)
 {
   // Here, we will explicitly create four nodes.
@@ -686,8 +678,6 @@
 
   // We should have received 10 packets on node 0
   NS_TEST_ASSERT_MSG_EQ (m_count, 10, "Node 0 should have received 10 packets");
-
-  return GetErrorStatus ();
 }
 
 class CsmaPingTestCase : public TestCase
@@ -697,7 +687,7 @@
   virtual ~CsmaPingTestCase ();
 
 private:
-  virtual bool DoRun (void);
+  virtual void DoRun (void);
   void SinkRx (Ptr<const Packet> p, const Address &ad);
   void PingRtt (std::string context, Time rtt);
   void DropEvent (Ptr<const Packet> p);
@@ -743,7 +733,7 @@
 //  node n0,n1,n3 pings to node n2
 //  node n0 generates protocol 2 (IGMP) to node n3
 //
-bool
+void
 CsmaPingTestCase::DoRun (void)
 {
   // Here, we will explicitly create four nodes.
@@ -811,8 +801,6 @@
 
   // We should have 3 pingers that ping every second for 3 seconds.
   NS_TEST_ASSERT_MSG_EQ (m_countPingRtt, 9, "Node 2 should have been pinged 9 times");
-
-  return GetErrorStatus ();
 }
 
 class CsmaRawIpSocketTestCase : public TestCase
@@ -822,7 +810,7 @@
   virtual ~CsmaRawIpSocketTestCase ();
 
 private:
-  virtual bool DoRun (void);
+  virtual void DoRun (void);
   void SinkRx (Ptr<const Packet> p, const Address &ad);
   void DropEvent (Ptr<const Packet> p);
   uint32_t m_count;
@@ -861,7 +849,7 @@
 // Node n0 sends data to node n3 over a raw IP socket.  The protocol
 // number used is 2.
 //
-bool
+void
 CsmaRawIpSocketTestCase::DoRun (void)
 {
   // Here, we will explicitly create four nodes.
@@ -913,8 +901,6 @@
 
   // We should have sent and received 10 packets
   NS_TEST_ASSERT_MSG_EQ (m_count, 10, "Node 3 should have received 10 packets");
-
-  return GetErrorStatus ();
 }
 
 class CsmaStarTestCase : public TestCase
@@ -924,7 +910,7 @@
   virtual ~CsmaStarTestCase ();
 
 private:
-  virtual bool DoRun (void);
+  virtual void DoRun (void);
   void SinkRx (Ptr<const Packet> p, const Address &ad);
   void DropEvent (Ptr<const Packet> p);
   uint32_t m_count;
@@ -970,7 +956,7 @@
 //             =======          =======           .
 //              CSMA             CSMA             .
 //
-bool
+void
 CsmaStarTestCase::DoRun (void)
 {
   //
@@ -1099,8 +1085,6 @@
   // The hub node should have received 10 packets from the nFill + 1
   // nodes on each spoke.
   NS_TEST_ASSERT_MSG_EQ (m_count, 10 * ( nSpokes * (nFill + 1)), "Hub node did not receive the proper number of packets");
-
-  return GetErrorStatus ();
 }
 
 class CsmaSystemTestSuite : public TestSuite