Attachment #259 for bug #345

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




#! /usr/bin/env python

"""Trace-comparison-type regression test for the Network Simulation Cradle."""

import os
import shutil
import sys
import tracediff
import platform


def run(verbose, generate, refDirName):
    """Run a Network Simulation Cradle test involving two TCP streams."""

    if not tracediff.env['ENABLE_NSC']:
        print >>sys.stderr, "Skipping tcp-nsc-lfn: NSC not available."
        raise NotImplementedError

    testName = "tcp-nsc-lfn"
    arguments = ["--ns3::OnOffApplication::DataRate=40000", "--runtime=20"]
    platform_bits = platform.architecture()[0]
    
    if platform_bits == "64bit":
        traceDirName = testName + "_64bit.ref"
    elif platform_bits == "32bit":
        traceDirName = testName + "_32bit.ref"
    else:
        # Something unexpected. How should we signal an error here? Rasing a
        # string might not be the best idea?
        raise "Unknown architecture, not 64 or 32 bit?"

    return tracediff.run_test(verbose, generate, refDirName,
        testName, arguments=arguments, refTestName=traceDirName)

(-)a/src/internet-stack/wscript (+3 lines)

Lines 54-59	Link Here

        nsc_update()

        nsc_update()

def configure(conf):

def configure(conf):

    conf.env['ENABLE_NSC'] = False

    # checks for flex and bison, which is needed to build NSCs globaliser

    # checks for flex and bison, which is needed to build NSCs globaliser

    def check_nsc_buildutils():

    def check_nsc_buildutils():

        import flex

        import flex

Lines 82-87	Link Here

        e.define = 'HAVE_DL'

        e.define = 'HAVE_DL'

        e.uselib = 'DL'

        e.uselib = 'DL'

        e.run()

        e.run()

        conf.env['ENABLE_NSC'] = True

        ok = True

        ok = True

    conf.check_message('NSC supported architecture', arch, ok)

    conf.check_message('NSC supported architecture', arch, ok)

    conf.report_optional_feature("nsc", "Network Simulation Cradle", ok,

    conf.report_optional_feature("nsc", "Network Simulation Cradle", ok,

(-)a/wscript (-2 / +8 lines)

Lines 820-826	Link Here

820

        self.testdir = testdir

820

        self.testdir = testdir

821

        self.env = Params.g_build.env_of_name('default')

821

        self.env = Params.g_build.env_of_name('default')

822

823

    def run_test(self, verbose, generate, refDirName, testName, arguments=[], pyscript=None):

823

    def run_test(self, verbose, generate, refDirName, testName, arguments=[], pyscript=None, refTestName=None):

824

"""

824

"""

825

        @param verbose: enable verbose execution

825

        @param verbose: enable verbose execution

826

Lines 836-846	Link Here

836

        parameter contains the path to the python script, relative to

836

        parameter contains the path to the python script, relative to

837

        the project root dir

837

        the project root dir

838

839

        @param refTestName: if not None, this is the name of the directory under refDirName

840

        that contains the reference traces. Otherwise "refDirname/testName + .ref" is used.

841

839

"""

842

"""

840

        if not isinstance(arguments, list):

843

        if not isinstance(arguments, list):

841

            raise TypeError

844

            raise TypeError

842

845

843

        refTestDirName = os.path.join(refDirName, (testName + ".ref"))

846

        if refTestName is None:

847

            refTestDirName = os.path.join(refDirName, (testName + ".ref"))

848

        else:

849

            refTestDirName = os.path.join(refDirName, refTestName)

844

850

845

        if not os.path.exists(refDirName):

851

        if not os.path.exists(refDirName):

846

            print"No reference trace repository"

852

            print"No reference trace repository"

Return to bug 345