Attachment #1023 for bug #699

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

(-)a/src/core/test.cc (-6 / +7 lines)

Lines 21-26	Link Here

#include "abort.h"

#include "abort.h"

#include <math.h>

#include <math.h>

// Set to true to enable a segmentation fault upon a test case macro test

// failing (for debugging purposes)

bool gBreakOnFailure = false;

bool gBreakOnFailure = false;

namespace ns3 {

namespace ns3 {

Lines 138-144	Link Here

138

  DoReportStart ();

140

  DoReportStart ();

139

141

140

142

141

bool

143

void

142

TestCase::Run (void)

144

TestCase::Run (void)

143

145

144

//

146

//

Lines 150-157	Link Here

150

  DoReportStart ();

152

  DoReportStart ();

151

  DoSetup ();

153

  DoSetup ();

152

154

153

  bool result = DoRun ();

155

  DoRun ();

154

  UpdateErrorStatus (result);

155

156

  DoTeardown ();

157

  DoTeardown ();

157

158

Lines 175-181	Link Here

175

176

  DoReportEnd ();

177

  DoReportEnd ();

177

178

  return GetErrorStatus ();

179

  return;

179

180

181

void

182

void

Lines 682-689	Link Here

682

//

683

//

683

      // Run the test case

684

      // Run the test case

684

//

685

//

685

      bool result = (*i)->Run ();

686

      (*i)->Run ();

686

      UpdateErrorStatus (result);

687

      UpdateErrorStatus ((*i)->GetErrorStatus ());

687

688

//

689

//

689

      // Exit if we have detected an error and we are not allowing multiple filures

690

      // Exit if we have detected an error and we are not allowing multiple filures




#define NS_TEST_SOURCEDIR \
  TestCase::GetSourceDir (__FILE__)

#define NS_TEST_RETURN_IF_ERROR \
  if (GetErrorStatus ()) \
    {                    \
      return true;       \
    } 

// ===========================================================================
// Test for equality (generic version)
// ===========================================================================

                       actualStream.str (), limitStream.str (), msgStream.str (), file, line);          \
        if (!ContinueOnFailure ())                                                                      \
          {                                                                                             \
            return;                                                                                     \
          }                                                                                             \
      }                                                                                                 \
  } while (false)

        ReportTestFailure (condStream.str (), actualStream.str (), limitStream.str (), msgStream.str (), file, line); \
        if (!ContinueOnFailure ())                                                                                    \
          {                                                                                                           \
            return;                                                                                                   \
          }                                                                                                           \
      }                                                                                                               \
  } while (false)

                       actualStream.str (), limitStream.str (), msgStream.str (), file, line);          \
        if (!ContinueOnFailure ())                                                                      \
          {                                                                                             \
            return;                                                                                     \
          }                                                                                             \
      }                                                                                                 \
  } while (false)

                       actualStream.str (), limitStream.str (), msgStream.str (), file, line);           \
        if (!ContinueOnFailure ())                                                                       \
          {                                                                                              \
            return;                                                                                      \
          }                                                                                              \
      }                                                                                                  \
  } while (false)

                       actualStream.str (), limitStream.str (), msgStream.str (), file, line);           \
        if (!ContinueOnFailure ())                                                                       \
          {                                                                                              \
            return;                                                                                      \
          }                                                                                              \
      }                                                                                                  \
  } while (false)


  /**
   * \brief Run this test case.
   * \returns Boolean sense of "an error has occurred."
   */
  void Run (void);

  /**
   * \brief Set the verbosity of this test case.

  /**
   * \internal
   * \brief Implementation to actually run this test case.
   * \returns Boolean sense of "an error has occurred."
   */
  virtual void DoRun (void) = 0;

  /**
   * \internal

Return to bug 699