fix diffs
authorCraig Dowell <craigdo@ee.washington.edu>
Mon, 31 Mar 2008 16:16:43 -0700
changeset 2856 f6244f4635d7
parent 2855 e1063ecd1585
child 2857 2c9890f41feb
fix diffs
regression/tests/test-csma-one-subnet.py
regression/tests/test-simple-point-to-point-olsr.py
regression/tests/test-simple-point-to-point.py
regression/tests/test-tcp-large-transfer.py
regression/tests/test-tcp-nonlistening-server.py
regression/tests/test-udp-echo.py
--- a/regression/tests/test-csma-one-subnet.py	Mon Mar 31 16:03:44 2008 -0700
+++ b/regression/tests/test-csma-one-subnet.py	Mon Mar 31 16:16:43 2008 -0700
@@ -37,4 +37,5 @@
         os.system("./waf --cwd regression/traces --run " +
           testName + " >& /dev/null")
         
-        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")
+        return os.system("diff -q traces " + repoName + refDirName +
+         " >& /dev/null")
--- a/regression/tests/test-simple-point-to-point-olsr.py	Mon Mar 31 16:03:44 2008 -0700
+++ b/regression/tests/test-simple-point-to-point-olsr.py	Mon Mar 31 16:16:43 2008 -0700
@@ -37,4 +37,5 @@
         os.system("./waf --cwd regression/traces --run " +
           testName + " >& /dev/null")
         
-        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")
+        return os.system("diff -q traces " + repoName + refDirName +
+         " >& /dev/null")
--- a/regression/tests/test-simple-point-to-point.py	Mon Mar 31 16:03:44 2008 -0700
+++ b/regression/tests/test-simple-point-to-point.py	Mon Mar 31 16:16:43 2008 -0700
@@ -37,4 +37,5 @@
         os.system("./waf --cwd regression/traces --run " +
           testName + " >& /dev/null")
         
-        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")
+        return os.system("diff -q traces " + repoName + refDirName +
+         " >& /dev/null")
--- a/regression/tests/test-tcp-large-transfer.py	Mon Mar 31 16:03:44 2008 -0700
+++ b/regression/tests/test-tcp-large-transfer.py	Mon Mar 31 16:16:43 2008 -0700
@@ -37,4 +37,5 @@
         os.system("./waf --cwd regression/traces --run " +
           testName + " >& /dev/null")
         
-        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")
+        return os.system("diff -q traces " + repoName + refDirName +
+         " >& /dev/null")
--- a/regression/tests/test-tcp-nonlistening-server.py	Mon Mar 31 16:03:44 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#! /usr/bin/env python
-
-"""Regression test tcp-nonlistening-server."""
-
-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)
-
-def run(verbose, generate):
-    """Execute a test."""
-
-    os.system("./waf --cwd regression/traces --run tcp-nonlistening-server >& /dev/null")
-
-    if generate:
-        rmdir("knowns")
-        os.rename("traces", "knowns")
-        os.system("tar -cjf tests/test-tcp-nonlistening-server.bz2 knowns/")
-        rmdir("knowns")
-        return 0
-    else:
-        rmdir("knowns")
-        os.system("tar -xjf tests/test-tcp-nonlistening-server.bz2 knowns/")
-        return os.system("diff -q knowns traces >& /dev/null")
--- a/regression/tests/test-udp-echo.py	Mon Mar 31 16:03:44 2008 -0700
+++ b/regression/tests/test-udp-echo.py	Mon Mar 31 16:16:43 2008 -0700
@@ -37,4 +37,5 @@
         os.system("./waf --cwd regression/traces --run " +
           testName + " >& /dev/null")
         
-        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")
+        return os.system("diff -q traces " + repoName + refDirName +
+         " >& /dev/null")