View | Details | Raw Unified | Return to bug 1397
Collapse All | Expand All

(-)a/src/core/test/threaded-test-suite.cc (-1 / +4 lines)
 Lines 18-23    Link Here 
18
 * Author: Claudio Freire <claudio-daniel.freire@inria.fr>
18
 * Author: Claudio Freire <claudio-daniel.freire@inria.fr>
19
 */
19
 */
20
#include "ns3/test.h"
20
#include "ns3/test.h"
21
#include "ns3/log.h"
21
#include "ns3/simulator.h"
22
#include "ns3/simulator.h"
22
#include "ns3/list-scheduler.h"
23
#include "ns3/list-scheduler.h"
23
#include "ns3/heap-scheduler.h"
24
#include "ns3/heap-scheduler.h"
 Lines 204-209    Link Here 
204
void 
205
void 
205
ThreadedSimulatorEventsTestCase::DoRun (void)
206
ThreadedSimulatorEventsTestCase::DoRun (void)
206
{
207
{
208
  NS_LOG_UNCOND ("DoRun");
207
  m_stop = false;
209
  m_stop = false;
208
  Simulator::SetScheduler (m_schedulerFactory);
210
  Simulator::SetScheduler (m_schedulerFactory);
209
211
 Lines 232-245    Link Here 
232
    : TestSuite ("threaded-simulator")
234
    : TestSuite ("threaded-simulator")
233
  {
235
  {
234
    std::string simulatorTypes[] = {
236
    std::string simulatorTypes[] = {
237
#ifdef HAVE_RT
235
      "ns3::RealtimeSimulatorImpl",
238
      "ns3::RealtimeSimulatorImpl",
239
#endif
236
      "ns3::DefaultSimulatorImpl"
240
      "ns3::DefaultSimulatorImpl"
237
    };
241
    };
238
    std::string schedulerTypes[] = {
242
    std::string schedulerTypes[] = {
239
      "ns3::ListScheduler",
243
      "ns3::ListScheduler",
240
      "ns3::HeapScheduler",
244
      "ns3::HeapScheduler",
241
      "ns3::MapScheduler",
245
      "ns3::MapScheduler",
242
      "ns3::CalendarScheduler",
243
#if 0
246
#if 0
244
      // Bug 1397
247
      // Bug 1397
245
      "ns3::CalendarScheduler",
248
      "ns3::CalendarScheduler",
(-)a/src/core/wscript (-1 / +1 lines)
 Lines 168-174    Link Here 
168
        'test/traced-callback-test-suite.cc',
168
        'test/traced-callback-test-suite.cc',
169
        'test/type-traits-test-suite.cc',
169
        'test/type-traits-test-suite.cc',
170
        'test/watchdog-test-suite.cc',
170
        'test/watchdog-test-suite.cc',
171
        'test/threaded-test-suite.cc',
172
        ]
171
        ]
173
172
174
    headers = bld.new_task_gen(features=['ns3header'])
173
    headers = bld.new_task_gen(features=['ns3header'])
 Lines 289-294    Link Here 
289
            'model/unix-system-mutex.cc',
288
            'model/unix-system-mutex.cc',
290
            'model/unix-system-condition.cc',
289
            'model/unix-system-condition.cc',
291
            ])
290
            ])
291
        core_test.source.extend(['test/threaded-test-suite.cc'])
292
        core.use.append('PTHREAD')
292
        core.use.append('PTHREAD')
293
        core_test.use.append('PTHREAD')
293
        core_test.use.append('PTHREAD')
294
        headers.source.extend([
294
        headers.source.extend([

Return to bug 1397