From 220d3e5a5f3669c2c0123449f2225c896b4acf8f Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Fri, 6 Apr 2012 15:25:43 -0700
Subject: [PATCH] disable faulty test in threaded-simulator

---
 src/core/test/threaded-test-suite.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/core/test/threaded-test-suite.cc b/src/core/test/threaded-test-suite.cc
index bccc80ef4..16bd85904 100644
--- a/src/core/test/threaded-test-suite.cc
+++ b/src/core/test/threaded-test-suite.cc
@@ -240,7 +240,13 @@ public:
       "ns3::HeapScheduler",
       "ns3::MapScheduler",
       "ns3::CalendarScheduler",
+#if 0
+      // Bug 1397
+      "ns3::CalendarScheduler",
       "ns3::Ns2CalendarScheduler"
+#else
+      "ns3::CalendarScheduler"
+#endif
     };
     unsigned int threadcounts[] = {
       0,