1.1 --- a/regression/regression.py	Mon Mar 31 13:54:57 2008 -0700
     1.2 +++ b/regression/regression.py	Mon Mar 31 16:03:44 2008 -0700
     1.3 @@ -45,6 +45,18 @@
     1.4          if o == '-v': verbose = 1
     1.5          if o == '-g': generate = 1
     1.6  
     1.7 +    userName = "craigdo/"
     1.8 +    repoName = "ns-3-ref-traces/"
     1.9 +
    1.10 +    if not os.path.exists(repoName):
    1.11 +        cloneCmd = "hg clone http://code.nsnam.org/" + userName + repoName
    1.12 +        os.system(cloneCmd)
    1.13 +    else:
    1.14 +        os.chdir(repoName)
    1.15 +        pullCmd = "hg pull http://code.nsnam.org/" + userName + repoName
    1.16 +        os.system(pullCmd)
    1.17 +        os.chdir("..")
    1.18 +
    1.19      bad = []
    1.20  
    1.21      if not testdir:

     2.1 Binary file regression/tests/test-csma-one-subnet.bz2 has changed

     3.1 --- a/regression/tests/test-csma-one-subnet.py	Mon Mar 31 13:54:57 2008 -0700
     3.2 +++ b/regression/tests/test-csma-one-subnet.py	Mon Mar 31 16:03:44 2008 -0700
     3.3 @@ -1,31 +1,40 @@
     3.4  #! /usr/bin/env python
     3.5  
     3.6 -"""Regression test csma-one-subnet."""
     3.7 +"""Generic trace-comparison-type regression test."""
     3.8  
     3.9  import os
    3.10 -
    3.11 -def rmdir(dir):
    3.12 -    if os.path.exists(dir):
    3.13 -        files = os.listdir(dir)
    3.14 -        for file in files:
    3.15 -            if file == '.' or file == '..':
    3.16 -                continue
    3.17 -            path = dir + os.sep + file
    3.18 -            os.remove(path)
    3.19 -        os.rmdir(dir)
    3.20 +import shutil
    3.21  
    3.22  def run(verbose, generate):
    3.23      """Execute a test."""
    3.24  
    3.25 -    os.system("./waf --cwd regression/traces --run csma-one-subnet >& /dev/null")
    3.26 +    testName = "csma-one-subnet"
    3.27 +    repoName = "ns-3-ref-traces/"
    3.28 +    refDirName = testName + ".ref"
    3.29 +
    3.30 +    if not os.path.exists(repoName):
    3.31 +        print"No reference trace repository"
    3.32 +        return 1
    3.33  
    3.34      if generate:
    3.35 -        rmdir("knowns")
    3.36 -        os.rename("traces", "knowns")
    3.37 -        os.system("tar -cjf tests/test-csma-one-subnet.bz2 knowns/")
    3.38 -        rmdir("knowns")
    3.39 +        if not os.path.exists(repoName + refDirName):
    3.40 +            print "creating new " + repoName + refDirName
    3.41 +            os.mkdir(repoName + refDirName)
    3.42 +
    3.43 +        os.system("./waf --cwd regression/" + repoName + refDirName +
    3.44 +            " --run " + testName + " >& /dev/null")
    3.45 +
    3.46 +        print "Remember to commit " + repoName + refDirName
    3.47          return 0
    3.48      else:
    3.49 -        rmdir("knowns")
    3.50 -        os.system("tar -xjf tests/test-csma-one-subnet.bz2 knowns/")
    3.51 -        return os.system("diff -q knowns traces >& /dev/null")
    3.52 +        if not os.path.exists(repoName + refDirName):
    3.53 +            print "Cannot locate reference traces"
    3.54 +            return 1
    3.55 +
    3.56 +        shutil.rmtree("traces");
    3.57 +        os.mkdir("traces")
    3.58 +        
    3.59 +        os.system("./waf --cwd regression/traces --run " +
    3.60 +          testName + " >& /dev/null")
    3.61 +        
    3.62 +        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")

     4.1 Binary file regression/tests/test-simple-point-to-point-olsr.bz2 has changed

     5.1 --- a/regression/tests/test-simple-point-to-point-olsr.py	Mon Mar 31 13:54:57 2008 -0700
     5.2 +++ b/regression/tests/test-simple-point-to-point-olsr.py	Mon Mar 31 16:03:44 2008 -0700
     5.3 @@ -1,31 +1,40 @@
     5.4  #! /usr/bin/env python
     5.5  
     5.6 -"""Regression test simple-point-to-point-olsr."""
     5.7 +"""Generic trace-comparison-type regression test."""
     5.8  
     5.9  import os
    5.10 -
    5.11 -def rmdir(dir):
    5.12 -    if os.path.exists(dir):
    5.13 -        files = os.listdir(dir)
    5.14 -        for file in files:
    5.15 -            if file == '.' or file == '..':
    5.16 -                continue
    5.17 -            path = dir + os.sep + file
    5.18 -            os.remove(path)
    5.19 -        os.rmdir(dir)
    5.20 +import shutil
    5.21  
    5.22  def run(verbose, generate):
    5.23      """Execute a test."""
    5.24  
    5.25 -    os.system("./waf --cwd regression/traces --run simple-point-to-point-olsr >& /dev/null")
    5.26 +    testName = "simple-point-to-point-olsr"
    5.27 +    repoName = "ns-3-ref-traces/"
    5.28 +    refDirName = testName + ".ref"
    5.29 +
    5.30 +    if not os.path.exists(repoName):
    5.31 +        print"No reference trace repository"
    5.32 +        return 1
    5.33  
    5.34      if generate:
    5.35 -        rmdir("knowns")
    5.36 -        os.rename("traces", "knowns")
    5.37 -        os.system("tar -cjf tests/test-simple-point-to-point-olsr.bz2 knowns/")
    5.38 -        rmdir("knowns")
    5.39 +        if not os.path.exists(repoName + refDirName):
    5.40 +            print "creating new " + repoName + refDirName
    5.41 +            os.mkdir(repoName + refDirName)
    5.42 +
    5.43 +        os.system("./waf --cwd regression/" + repoName + refDirName +
    5.44 +            " --run " + testName + " >& /dev/null")
    5.45 +
    5.46 +        print "Remember to commit " + repoName + refDirName
    5.47          return 0
    5.48      else:
    5.49 -        rmdir("knowns")
    5.50 -        os.system("tar -xjf tests/test-simple-point-to-point-olsr.bz2 knowns/")
    5.51 -        return os.system("diff -q knowns traces >& /dev/null")
    5.52 +        if not os.path.exists(repoName + refDirName):
    5.53 +            print "Cannot locate reference traces"
    5.54 +            return 1
    5.55 +
    5.56 +        shutil.rmtree("traces");
    5.57 +        os.mkdir("traces")
    5.58 +        
    5.59 +        os.system("./waf --cwd regression/traces --run " +
    5.60 +          testName + " >& /dev/null")
    5.61 +        
    5.62 +        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")

     6.1 Binary file regression/tests/test-simple-point-to-point.bz2 has changed

     7.1 --- a/regression/tests/test-simple-point-to-point.py	Mon Mar 31 13:54:57 2008 -0700
     7.2 +++ b/regression/tests/test-simple-point-to-point.py	Mon Mar 31 16:03:44 2008 -0700
     7.3 @@ -1,31 +1,40 @@
     7.4  #! /usr/bin/env python
     7.5  
     7.6 -"""Regression test simple-point-to-point."""
     7.7 +"""Generic trace-comparison-type regression test."""
     7.8  
     7.9  import os
    7.10 -
    7.11 -def rmdir(dir):
    7.12 -    if os.path.exists(dir):
    7.13 -        files = os.listdir(dir)
    7.14 -        for file in files:
    7.15 -            if file == '.' or file == '..':
    7.16 -                continue
    7.17 -            path = dir + os.sep + file
    7.18 -            os.remove(path)
    7.19 -        os.rmdir(dir)
    7.20 +import shutil
    7.21  
    7.22  def run(verbose, generate):
    7.23      """Execute a test."""
    7.24  
    7.25 -    os.system("./waf --cwd regression/traces --run simple-point-to-point >& /dev/null")
    7.26 +    testName = "simple-point-to-point"
    7.27 +    repoName = "ns-3-ref-traces/"
    7.28 +    refDirName = testName + ".ref"
    7.29 +
    7.30 +    if not os.path.exists(repoName):
    7.31 +        print"No reference trace repository"
    7.32 +        return 1
    7.33  
    7.34      if generate:
    7.35 -        rmdir("knowns")
    7.36 -        os.rename("traces", "knowns")
    7.37 -        os.system("tar -cjf tests/test-simple-point-to-point.bz2 knowns/")
    7.38 -        rmdir("knowns")
    7.39 +        if not os.path.exists(repoName + refDirName):
    7.40 +            print "creating new " + repoName + refDirName
    7.41 +            os.mkdir(repoName + refDirName)
    7.42 +
    7.43 +        os.system("./waf --cwd regression/" + repoName + refDirName +
    7.44 +            " --run " + testName + " >& /dev/null")
    7.45 +
    7.46 +        print "Remember to commit " + repoName + refDirName
    7.47          return 0
    7.48      else:
    7.49 -        rmdir("knowns")
    7.50 -        os.system("tar -xjf tests/test-simple-point-to-point.bz2 knowns/")
    7.51 -        return os.system("diff -q knowns traces >& /dev/null")
    7.52 +        if not os.path.exists(repoName + refDirName):
    7.53 +            print "Cannot locate reference traces"
    7.54 +            return 1
    7.55 +
    7.56 +        shutil.rmtree("traces");
    7.57 +        os.mkdir("traces")
    7.58 +        
    7.59 +        os.system("./waf --cwd regression/traces --run " +
    7.60 +          testName + " >& /dev/null")
    7.61 +        
    7.62 +        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")

     8.1 Binary file regression/tests/test-tcp-large-transfer.bz2 has changed

     9.1 --- a/regression/tests/test-tcp-large-transfer.py	Mon Mar 31 13:54:57 2008 -0700
     9.2 +++ b/regression/tests/test-tcp-large-transfer.py	Mon Mar 31 16:03:44 2008 -0700
     9.3 @@ -1,31 +1,40 @@
     9.4  #! /usr/bin/env python
     9.5  
     9.6 -"""Regression test tcp-large-transfer."""
     9.7 +"""Generic trace-comparison-type regression test."""
     9.8  
     9.9  import os
    9.10 -
    9.11 -def rmdir(dir):
    9.12 -    if os.path.exists(dir):
    9.13 -        files = os.listdir(dir)
    9.14 -        for file in files:
    9.15 -            if file == '.' or file == '..':
    9.16 -                continue
    9.17 -            path = dir + os.sep + file
    9.18 -            os.remove(path)
    9.19 -        os.rmdir(dir)
    9.20 +import shutil
    9.21  
    9.22  def run(verbose, generate):
    9.23      """Execute a test."""
    9.24  
    9.25 -    os.system("./waf --cwd regression/traces --run tcp-large-transfer >& /dev/null")
    9.26 +    testName = "tcp-large-transfer"
    9.27 +    repoName = "ns-3-ref-traces/"
    9.28 +    refDirName = testName + ".ref"
    9.29 +
    9.30 +    if not os.path.exists(repoName):
    9.31 +        print"No reference trace repository"
    9.32 +        return 1
    9.33  
    9.34      if generate:
    9.35 -        rmdir("knowns")
    9.36 -        os.rename("traces", "knowns")
    9.37 -        os.system("tar -cjf tests/test-tcp-large-transfer.bz2 knowns/")
    9.38 -        rmdir("knowns")
    9.39 +        if not os.path.exists(repoName + refDirName):
    9.40 +            print "creating new " + repoName + refDirName
    9.41 +            os.mkdir(repoName + refDirName)
    9.42 +
    9.43 +        os.system("./waf --cwd regression/" + repoName + refDirName +
    9.44 +            " --run " + testName + " >& /dev/null")
    9.45 +
    9.46 +        print "Remember to commit " + repoName + refDirName
    9.47          return 0
    9.48      else:
    9.49 -        rmdir("knowns")
    9.50 -        os.system("tar -xjf tests/test-tcp-large-transfer.bz2 knowns/")
    9.51 -        return os.system("diff -q knowns traces >& /dev/null")
    9.52 +        if not os.path.exists(repoName + refDirName):
    9.53 +            print "Cannot locate reference traces"
    9.54 +            return 1
    9.55 +
    9.56 +        shutil.rmtree("traces");
    9.57 +        os.mkdir("traces")
    9.58 +        
    9.59 +        os.system("./waf --cwd regression/traces --run " +
    9.60 +          testName + " >& /dev/null")
    9.61 +        
    9.62 +        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")

    10.1 Binary file regression/tests/test-tcp-nonlistening-server.bz2 has changed

    11.1 Binary file regression/tests/test-tcp-small-transfer.bz2 has changed

    12.1 --- a/regression/tests/test-tcp-small-transfer.py	Mon Mar 31 13:54:57 2008 -0700
    12.2 +++ b/regression/tests/test-tcp-small-transfer.py	Mon Mar 31 16:03:44 2008 -0700
    12.3 @@ -1,31 +1,40 @@
    12.4  #! /usr/bin/env python
    12.5  
    12.6 -"""Regression test tcp-small-transfer."""
    12.7 +"""Generic trace-comparison-type regression test."""
    12.8  
    12.9  import os
   12.10 -
   12.11 -def rmdir(dir):
   12.12 -    if os.path.exists(dir):
   12.13 -        files = os.listdir(dir)
   12.14 -        for file in files:
   12.15 -            if file == '.' or file == '..':
   12.16 -                continue
   12.17 -            path = dir + os.sep + file
   12.18 -            os.remove(path)
   12.19 -        os.rmdir(dir)
   12.20 +import shutil
   12.21  
   12.22  def run(verbose, generate):
   12.23      """Execute a test."""
   12.24  
   12.25 -    os.system("./waf --cwd regression/traces --run tcp-small-transfer >& /dev/null")
   12.26 +    testName = "tcp-small-transfer"
   12.27 +    repoName = "ns-3-ref-traces/"
   12.28 +    refDirName = testName + ".ref"
   12.29 +
   12.30 +    if not os.path.exists(repoName):
   12.31 +        print"No reference trace repository"
   12.32 +        return 1
   12.33  
   12.34      if generate:
   12.35 -        rmdir("knowns")
   12.36 -        os.rename("traces", "knowns")
   12.37 -        os.system("tar -cjf tests/test-tcp-small-transfer.bz2 knowns/")
   12.38 -        rmdir("knowns")
   12.39 +        if not os.path.exists(repoName + refDirName):
   12.40 +            print "creating new " + repoName + refDirName
   12.41 +            os.mkdir(repoName + refDirName)
   12.42 +
   12.43 +        os.system("./waf --cwd regression/" + repoName + refDirName +
   12.44 +            " --run " + testName + " >& /dev/null")
   12.45 +
   12.46 +        print "Remember to commit " + repoName + refDirName
   12.47          return 0
   12.48      else:
   12.49 -        rmdir("knowns")
   12.50 -        os.system("tar -xjf tests/test-tcp-small-transfer.bz2 knowns/")
   12.51 -        return os.system("diff -q knowns traces >& /dev/null")
   12.52 +        if not os.path.exists(repoName + refDirName):
   12.53 +            print "Cannot locate reference traces"
   12.54 +            return 1
   12.55 +
   12.56 +        shutil.rmtree("traces");
   12.57 +        os.mkdir("traces")
   12.58 +        
   12.59 +        os.system("./waf --cwd regression/traces --run " +
   12.60 +          testName + " >& /dev/null")
   12.61 +        
   12.62 +        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")

    13.1 Binary file regression/tests/test-udp-echo.bz2 has changed

    14.1 --- a/regression/tests/test-udp-echo.py	Mon Mar 31 13:54:57 2008 -0700
    14.2 +++ b/regression/tests/test-udp-echo.py	Mon Mar 31 16:03:44 2008 -0700
    14.3 @@ -1,31 +1,40 @@
    14.4  #! /usr/bin/env python
    14.5  
    14.6 -"""Regression test udp-echo."""
    14.7 +"""Generic trace-comparison-type regression test."""
    14.8  
    14.9  import os
   14.10 -
   14.11 -def rmdir(dir):
   14.12 -    if os.path.exists(dir):
   14.13 -        files = os.listdir(dir)
   14.14 -        for file in files:
   14.15 -            if file == '.' or file == '..':
   14.16 -                continue
   14.17 -            path = dir + os.sep + file
   14.18 -            os.remove(path)
   14.19 -        os.rmdir(dir)
   14.20 +import shutil
   14.21  
   14.22  def run(verbose, generate):
   14.23      """Execute a test."""
   14.24  
   14.25 -    os.system("./waf --cwd regression/traces --run udp-echo >& /dev/null")
   14.26 +    testName = "udp-echo"
   14.27 +    repoName = "ns-3-ref-traces/"
   14.28 +    refDirName = testName + ".ref"
   14.29 +
   14.30 +    if not os.path.exists(repoName):
   14.31 +        print"No reference trace repository"
   14.32 +        return 1
   14.33  
   14.34      if generate:
   14.35 -        rmdir("knowns")
   14.36 -        os.rename("traces", "knowns")
   14.37 -        os.system("tar -cjf tests/test-udp-echo.bz2 knowns/")
   14.38 -        rmdir("knowns")
   14.39 +        if not os.path.exists(repoName + refDirName):
   14.40 +            print "creating new " + repoName + refDirName
   14.41 +            os.mkdir(repoName + refDirName)
   14.42 +
   14.43 +        os.system("./waf --cwd regression/" + repoName + refDirName +
   14.44 +            " --run " + testName + " >& /dev/null")
   14.45 +
   14.46 +        print "Remember to commit " + repoName + refDirName
   14.47          return 0
   14.48      else:
   14.49 -        rmdir("knowns")
   14.50 -        os.system("tar -xjf tests/test-udp-echo.bz2 knowns/")
   14.51 -        return os.system("diff -q knowns traces >& /dev/null")
   14.52 +        if not os.path.exists(repoName + refDirName):
   14.53 +            print "Cannot locate reference traces"
   14.54 +            return 1
   14.55 +
   14.56 +        shutil.rmtree("traces");
   14.57 +        os.mkdir("traces")
   14.58 +        
   14.59 +        os.system("./waf --cwd regression/traces --run " +
   14.60 +          testName + " >& /dev/null")
   14.61 +        
   14.62 +        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")