From 9c1922aebe3574b595ea35d6dfa938718e1f662c Mon Sep 17 00:00:00 2001
From: Craig Dowell <craigdo@ee.washington.edu>
Date: Mon, 31 Mar 2008 16:16:43 -0700
Subject: [PATCH] fix diffs

---
 regression/tests/test-csma-one-subnet.py      |  3 +-
 .../tests/test-simple-point-to-point-olsr.py  |  3 +-
 .../tests/test-simple-point-to-point.py       |  3 +-
 regression/tests/test-tcp-large-transfer.py   |  3 +-
 .../tests/test-tcp-nonlistening-server.py     | 31 -------------------
 regression/tests/test-udp-echo.py             |  3 +-
 6 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 regression/tests/test-tcp-nonlistening-server.py

diff --git a/regression/tests/test-csma-one-subnet.py b/regression/tests/test-csma-one-subnet.py
index a634fc6fe..6ac377878 100644
--- a/regression/tests/test-csma-one-subnet.py
+++ b/regression/tests/test-csma-one-subnet.py
@@ -37,4 +37,5 @@ def run(verbose, generate):
         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")
diff --git a/regression/tests/test-simple-point-to-point-olsr.py b/regression/tests/test-simple-point-to-point-olsr.py
index 63954dc45..4566c8a4d 100644
--- a/regression/tests/test-simple-point-to-point-olsr.py
+++ b/regression/tests/test-simple-point-to-point-olsr.py
@@ -37,4 +37,5 @@ def run(verbose, generate):
         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")
diff --git a/regression/tests/test-simple-point-to-point.py b/regression/tests/test-simple-point-to-point.py
index 2a1b91832..3e492c4e4 100644
--- a/regression/tests/test-simple-point-to-point.py
+++ b/regression/tests/test-simple-point-to-point.py
@@ -37,4 +37,5 @@ def run(verbose, generate):
         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")
diff --git a/regression/tests/test-tcp-large-transfer.py b/regression/tests/test-tcp-large-transfer.py
index 21dd596f5..824272dc3 100644
--- a/regression/tests/test-tcp-large-transfer.py
+++ b/regression/tests/test-tcp-large-transfer.py
@@ -37,4 +37,5 @@ def run(verbose, generate):
         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")
diff --git a/regression/tests/test-tcp-nonlistening-server.py b/regression/tests/test-tcp-nonlistening-server.py
deleted file mode 100644
index 794c73753..000000000
--- a/regression/tests/test-tcp-nonlistening-server.py
+++ /dev/null
@@ -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")
diff --git a/regression/tests/test-udp-echo.py b/regression/tests/test-udp-echo.py
index 2d634553a..396ae9158 100644
--- a/regression/tests/test-udp-echo.py
+++ b/regression/tests/test-udp-echo.py
@@ -37,4 +37,5 @@ def run(verbose, generate):
         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")