only test threaded-simulator cases appropriate for the configuration
authorTom Henderson <tomh@tomh.org>
Tue, 10 Apr 2012 16:07:39 -0700
changeset 7826 5ed75237e75a
parent 7825 b3edf14c5fcd
child 7844 24575485b234
only test threaded-simulator cases appropriate for the configuration
src/core/test/threaded-test-suite.cc
src/core/wscript
--- a/src/core/test/threaded-test-suite.cc	Tue Apr 10 15:52:32 2012 -0700
+++ b/src/core/test/threaded-test-suite.cc	Tue Apr 10 16:07:39 2012 -0700
@@ -232,7 +232,9 @@
     : TestSuite ("threaded-simulator")
   {
     std::string simulatorTypes[] = {
+#ifdef HAVE_RT
       "ns3::RealtimeSimulatorImpl",
+#endif
       "ns3::DefaultSimulatorImpl"
     };
     std::string schedulerTypes[] = {
--- a/src/core/wscript	Tue Apr 10 15:52:32 2012 -0700
+++ b/src/core/wscript	Tue Apr 10 16:07:39 2012 -0700
@@ -168,7 +168,6 @@
         'test/traced-callback-test-suite.cc',
         'test/type-traits-test-suite.cc',
         'test/watchdog-test-suite.cc',
-        'test/threaded-test-suite.cc',
         ]
 
     headers = bld.new_task_gen(features=['ns3header'])
@@ -291,6 +290,7 @@
             ])
         core.use.append('PTHREAD')
         core_test.use.append('PTHREAD')
+        core_test.source.extend(['test/threaded-test-suite.cc'])
         headers.source.extend([
                 'model/unix-fd-reader.h',
                 'model/system-mutex.h',