1.1 --- a/regression/tests/test-simple-point-to-point.py	Mon Mar 31 16:22:24 2008 -0700
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,41 +0,0 @@
     1.4 -#! /usr/bin/env python
     1.5 -
     1.6 -"""Generic trace-comparison-type regression test."""
     1.7 -
     1.8 -import os
     1.9 -import shutil
    1.10 -
    1.11 -def run(verbose, generate):
    1.12 -    """Execute a test."""
    1.13 -
    1.14 -    testName = "simple-point-to-point"
    1.15 -    repoName = "ns-3-ref-traces/"
    1.16 -    refDirName = testName + ".ref"
    1.17 -
    1.18 -    if not os.path.exists(repoName):
    1.19 -        print"No reference trace repository"
    1.20 -        return 1
    1.21 -
    1.22 -    if generate:
    1.23 -        if not os.path.exists(repoName + refDirName):
    1.24 -            print "creating new " + repoName + refDirName
    1.25 -            os.mkdir(repoName + refDirName)
    1.26 -
    1.27 -        os.system("./waf --cwd regression/" + repoName + refDirName +
    1.28 -            " --run " + testName + " >& /dev/null")
    1.29 -
    1.30 -        print "Remember to commit " + repoName + refDirName
    1.31 -        return 0
    1.32 -    else:
    1.33 -        if not os.path.exists(repoName + refDirName):
    1.34 -            print "Cannot locate reference traces"
    1.35 -            return 1
    1.36 -
    1.37 -        shutil.rmtree("traces");
    1.38 -        os.mkdir("traces")
    1.39 -        
    1.40 -        os.system("./waf --cwd regression/traces --run " +
    1.41 -          testName + " >& /dev/null")
    1.42 -        
    1.43 -        return os.system("diff -q traces " + repoName + refDirName +
    1.44 -         " >& /dev/null")

     2.1 --- a/regression/tests/test-tcp-small-transfer.py	Mon Mar 31 16:22:24 2008 -0700
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,40 +0,0 @@
     2.4 -#! /usr/bin/env python
     2.5 -
     2.6 -"""Generic trace-comparison-type regression test."""
     2.7 -
     2.8 -import os
     2.9 -import shutil
    2.10 -
    2.11 -def run(verbose, generate):
    2.12 -    """Execute a test."""
    2.13 -
    2.14 -    testName = "tcp-small-transfer"
    2.15 -    repoName = "ns-3-ref-traces/"
    2.16 -    refDirName = testName + ".ref"
    2.17 -
    2.18 -    if not os.path.exists(repoName):
    2.19 -        print"No reference trace repository"
    2.20 -        return 1
    2.21 -
    2.22 -    if generate:
    2.23 -        if not os.path.exists(repoName + refDirName):
    2.24 -            print "creating new " + repoName + refDirName
    2.25 -            os.mkdir(repoName + refDirName)
    2.26 -
    2.27 -        os.system("./waf --cwd regression/" + repoName + refDirName +
    2.28 -            " --run " + testName + " >& /dev/null")
    2.29 -
    2.30 -        print "Remember to commit " + repoName + refDirName
    2.31 -        return 0
    2.32 -    else:
    2.33 -        if not os.path.exists(repoName + refDirName):
    2.34 -            print "Cannot locate reference traces"
    2.35 -            return 1
    2.36 -
    2.37 -        shutil.rmtree("traces");
    2.38 -        os.mkdir("traces")
    2.39 -        
    2.40 -        os.system("./waf --cwd regression/traces --run " +
    2.41 -          testName + " >& /dev/null")
    2.42 -        
    2.43 -        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")