--- a/regression/regression.py	Mon Mar 31 13:54:57 2008 -0700
+++ b/regression/regression.py	Mon Mar 31 16:03:44 2008 -0700
@@ -45,6 +45,18 @@
         if o == '-v': verbose = 1
         if o == '-g': generate = 1
 
+    userName = "craigdo/"
+    repoName = "ns-3-ref-traces/"
+
+    if not os.path.exists(repoName):
+        cloneCmd = "hg clone http://code.nsnam.org/" + userName + repoName
+        os.system(cloneCmd)
+    else:
+        os.chdir(repoName)
+        pullCmd = "hg pull http://code.nsnam.org/" + userName + repoName
+        os.system(pullCmd)
+        os.chdir("..")
+
     bad = []
 
     if not testdir:

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

--- a/regression/tests/test-csma-one-subnet.py	Mon Mar 31 13:54:57 2008 -0700
+++ b/regression/tests/test-csma-one-subnet.py	Mon Mar 31 16:03:44 2008 -0700
@@ -1,31 +1,40 @@
 #! /usr/bin/env python
 
-"""Regression test csma-one-subnet."""
+"""Generic trace-comparison-type regression test."""
 
 import os
-
-def rmdir(dir):
-    if os.path.exists(dir):
-        files = os.listdir(dir)
-        for file in files:
-            if file == '.' or file == '..':
-                continue
-            path = dir + os.sep + file
-            os.remove(path)
-        os.rmdir(dir)
+import shutil
 
 def run(verbose, generate):
     """Execute a test."""
 
-    os.system("./waf --cwd regression/traces --run csma-one-subnet >& /dev/null")
+    testName = "csma-one-subnet"
+    repoName = "ns-3-ref-traces/"
+    refDirName = testName + ".ref"
+
+    if not os.path.exists(repoName):
+        print"No reference trace repository"
+        return 1
 
     if generate:
-        rmdir("knowns")
-        os.rename("traces", "knowns")
-        os.system("tar -cjf tests/test-csma-one-subnet.bz2 knowns/")
-        rmdir("knowns")
+        if not os.path.exists(repoName + refDirName):
+            print "creating new " + repoName + refDirName
+            os.mkdir(repoName + refDirName)
+
+        os.system("./waf --cwd regression/" + repoName + refDirName +
+            " --run " + testName + " >& /dev/null")
+
+        print "Remember to commit " + repoName + refDirName
         return 0
     else:
-        rmdir("knowns")
-        os.system("tar -xjf tests/test-csma-one-subnet.bz2 knowns/")
-        return os.system("diff -q knowns traces >& /dev/null")
+        if not os.path.exists(repoName + refDirName):
+            print "Cannot locate reference traces"
+            return 1
+
+        shutil.rmtree("traces");
+        os.mkdir("traces")
+        
+        os.system("./waf --cwd regression/traces --run " +
+          testName + " >& /dev/null")
+        
+        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")

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

--- a/regression/tests/test-simple-point-to-point-olsr.py	Mon Mar 31 13:54:57 2008 -0700
+++ b/regression/tests/test-simple-point-to-point-olsr.py	Mon Mar 31 16:03:44 2008 -0700
@@ -1,31 +1,40 @@
 #! /usr/bin/env python
 
-"""Regression test simple-point-to-point-olsr."""
+"""Generic trace-comparison-type regression test."""
 
 import os
-
-def rmdir(dir):
-    if os.path.exists(dir):
-        files = os.listdir(dir)
-        for file in files:
-            if file == '.' or file == '..':
-                continue
-            path = dir + os.sep + file
-            os.remove(path)
-        os.rmdir(dir)
+import shutil
 
 def run(verbose, generate):
     """Execute a test."""
 
-    os.system("./waf --cwd regression/traces --run simple-point-to-point-olsr >& /dev/null")
+    testName = "simple-point-to-point-olsr"
+    repoName = "ns-3-ref-traces/"
+    refDirName = testName + ".ref"
+
+    if not os.path.exists(repoName):
+        print"No reference trace repository"
+        return 1
 
     if generate:
-        rmdir("knowns")
-        os.rename("traces", "knowns")
-        os.system("tar -cjf tests/test-simple-point-to-point-olsr.bz2 knowns/")
-        rmdir("knowns")
+        if not os.path.exists(repoName + refDirName):
+            print "creating new " + repoName + refDirName
+            os.mkdir(repoName + refDirName)
+
+        os.system("./waf --cwd regression/" + repoName + refDirName +
+            " --run " + testName + " >& /dev/null")
+
+        print "Remember to commit " + repoName + refDirName
         return 0
     else:
-        rmdir("knowns")
-        os.system("tar -xjf tests/test-simple-point-to-point-olsr.bz2 knowns/")
-        return os.system("diff -q knowns traces >& /dev/null")
+        if not os.path.exists(repoName + refDirName):
+            print "Cannot locate reference traces"
+            return 1
+
+        shutil.rmtree("traces");
+        os.mkdir("traces")
+        
+        os.system("./waf --cwd regression/traces --run " +
+          testName + " >& /dev/null")
+        
+        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")

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

--- a/regression/tests/test-simple-point-to-point.py	Mon Mar 31 13:54:57 2008 -0700
+++ b/regression/tests/test-simple-point-to-point.py	Mon Mar 31 16:03:44 2008 -0700
@@ -1,31 +1,40 @@
 #! /usr/bin/env python
 
-"""Regression test simple-point-to-point."""
+"""Generic trace-comparison-type regression test."""
 
 import os
-
-def rmdir(dir):
-    if os.path.exists(dir):
-        files = os.listdir(dir)
-        for file in files:
-            if file == '.' or file == '..':
-                continue
-            path = dir + os.sep + file
-            os.remove(path)
-        os.rmdir(dir)
+import shutil
 
 def run(verbose, generate):
     """Execute a test."""
 
-    os.system("./waf --cwd regression/traces --run simple-point-to-point >& /dev/null")
+    testName = "simple-point-to-point"
+    repoName = "ns-3-ref-traces/"
+    refDirName = testName + ".ref"
+
+    if not os.path.exists(repoName):
+        print"No reference trace repository"
+        return 1
 
     if generate:
-        rmdir("knowns")
-        os.rename("traces", "knowns")
-        os.system("tar -cjf tests/test-simple-point-to-point.bz2 knowns/")
-        rmdir("knowns")
+        if not os.path.exists(repoName + refDirName):
+            print "creating new " + repoName + refDirName
+            os.mkdir(repoName + refDirName)
+
+        os.system("./waf --cwd regression/" + repoName + refDirName +
+            " --run " + testName + " >& /dev/null")
+
+        print "Remember to commit " + repoName + refDirName
         return 0
     else:
-        rmdir("knowns")
-        os.system("tar -xjf tests/test-simple-point-to-point.bz2 knowns/")
-        return os.system("diff -q knowns traces >& /dev/null")
+        if not os.path.exists(repoName + refDirName):
+            print "Cannot locate reference traces"
+            return 1
+
+        shutil.rmtree("traces");
+        os.mkdir("traces")
+        
+        os.system("./waf --cwd regression/traces --run " +
+          testName + " >& /dev/null")
+        
+        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")

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

--- a/regression/tests/test-tcp-large-transfer.py	Mon Mar 31 13:54:57 2008 -0700
+++ b/regression/tests/test-tcp-large-transfer.py	Mon Mar 31 16:03:44 2008 -0700
@@ -1,31 +1,40 @@
 #! /usr/bin/env python
 
-"""Regression test tcp-large-transfer."""
+"""Generic trace-comparison-type regression test."""
 
 import os
-
-def rmdir(dir):
-    if os.path.exists(dir):
-        files = os.listdir(dir)
-        for file in files:
-            if file == '.' or file == '..':
-                continue
-            path = dir + os.sep + file
-            os.remove(path)
-        os.rmdir(dir)
+import shutil
 
 def run(verbose, generate):
     """Execute a test."""
 
-    os.system("./waf --cwd regression/traces --run tcp-large-transfer >& /dev/null")
+    testName = "tcp-large-transfer"
+    repoName = "ns-3-ref-traces/"
+    refDirName = testName + ".ref"
+
+    if not os.path.exists(repoName):
+        print"No reference trace repository"
+        return 1
 
     if generate:
-        rmdir("knowns")
-        os.rename("traces", "knowns")
-        os.system("tar -cjf tests/test-tcp-large-transfer.bz2 knowns/")
-        rmdir("knowns")
+        if not os.path.exists(repoName + refDirName):
+            print "creating new " + repoName + refDirName
+            os.mkdir(repoName + refDirName)
+
+        os.system("./waf --cwd regression/" + repoName + refDirName +
+            " --run " + testName + " >& /dev/null")
+
+        print "Remember to commit " + repoName + refDirName
         return 0
     else:
-        rmdir("knowns")
-        os.system("tar -xjf tests/test-tcp-large-transfer.bz2 knowns/")
-        return os.system("diff -q knowns traces >& /dev/null")
+        if not os.path.exists(repoName + refDirName):
+            print "Cannot locate reference traces"
+            return 1
+
+        shutil.rmtree("traces");
+        os.mkdir("traces")
+        
+        os.system("./waf --cwd regression/traces --run " +
+          testName + " >& /dev/null")
+        
+        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")

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

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

--- a/regression/tests/test-tcp-small-transfer.py	Mon Mar 31 13:54:57 2008 -0700
+++ b/regression/tests/test-tcp-small-transfer.py	Mon Mar 31 16:03:44 2008 -0700
@@ -1,31 +1,40 @@
 #! /usr/bin/env python
 
-"""Regression test tcp-small-transfer."""
+"""Generic trace-comparison-type regression test."""
 
 import os
-
-def rmdir(dir):
-    if os.path.exists(dir):
-        files = os.listdir(dir)
-        for file in files:
-            if file == '.' or file == '..':
-                continue
-            path = dir + os.sep + file
-            os.remove(path)
-        os.rmdir(dir)
+import shutil
 
 def run(verbose, generate):
     """Execute a test."""
 
-    os.system("./waf --cwd regression/traces --run tcp-small-transfer >& /dev/null")
+    testName = "tcp-small-transfer"
+    repoName = "ns-3-ref-traces/"
+    refDirName = testName + ".ref"
+
+    if not os.path.exists(repoName):
+        print"No reference trace repository"
+        return 1
 
     if generate:
-        rmdir("knowns")
-        os.rename("traces", "knowns")
-        os.system("tar -cjf tests/test-tcp-small-transfer.bz2 knowns/")
-        rmdir("knowns")
+        if not os.path.exists(repoName + refDirName):
+            print "creating new " + repoName + refDirName
+            os.mkdir(repoName + refDirName)
+
+        os.system("./waf --cwd regression/" + repoName + refDirName +
+            " --run " + testName + " >& /dev/null")
+
+        print "Remember to commit " + repoName + refDirName
         return 0
     else:
-        rmdir("knowns")
-        os.system("tar -xjf tests/test-tcp-small-transfer.bz2 knowns/")
-        return os.system("diff -q knowns traces >& /dev/null")
+        if not os.path.exists(repoName + refDirName):
+            print "Cannot locate reference traces"
+            return 1
+
+        shutil.rmtree("traces");
+        os.mkdir("traces")
+        
+        os.system("./waf --cwd regression/traces --run " +
+          testName + " >& /dev/null")
+        
+        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")

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

--- a/regression/tests/test-udp-echo.py	Mon Mar 31 13:54:57 2008 -0700
+++ b/regression/tests/test-udp-echo.py	Mon Mar 31 16:03:44 2008 -0700
@@ -1,31 +1,40 @@
 #! /usr/bin/env python
 
-"""Regression test udp-echo."""
+"""Generic trace-comparison-type regression test."""
 
 import os
-
-def rmdir(dir):
-    if os.path.exists(dir):
-        files = os.listdir(dir)
-        for file in files:
-            if file == '.' or file == '..':
-                continue
-            path = dir + os.sep + file
-            os.remove(path)
-        os.rmdir(dir)
+import shutil
 
 def run(verbose, generate):
     """Execute a test."""
 
-    os.system("./waf --cwd regression/traces --run udp-echo >& /dev/null")
+    testName = "udp-echo"
+    repoName = "ns-3-ref-traces/"
+    refDirName = testName + ".ref"
+
+    if not os.path.exists(repoName):
+        print"No reference trace repository"
+        return 1
 
     if generate:
-        rmdir("knowns")
-        os.rename("traces", "knowns")
-        os.system("tar -cjf tests/test-udp-echo.bz2 knowns/")
-        rmdir("knowns")
+        if not os.path.exists(repoName + refDirName):
+            print "creating new " + repoName + refDirName
+            os.mkdir(repoName + refDirName)
+
+        os.system("./waf --cwd regression/" + repoName + refDirName +
+            " --run " + testName + " >& /dev/null")
+
+        print "Remember to commit " + repoName + refDirName
         return 0
     else:
-        rmdir("knowns")
-        os.system("tar -xjf tests/test-udp-echo.bz2 knowns/")
-        return os.system("diff -q knowns traces >& /dev/null")
+        if not os.path.exists(repoName + refDirName):
+            print "Cannot locate reference traces"
+            return 1
+
+        shutil.rmtree("traces");
+        os.mkdir("traces")
+        
+        os.system("./waf --cwd regression/traces --run " +
+          testName + " >& /dev/null")
+        
+        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")