fix diffs
authorCraig Dowell <craigdo@ee.washington.edu>
Mon Mar 31 16:16:43 2008 -0700 (22 months ago)
changeset 2856f6244f4635d7
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
     1.1 --- a/regression/tests/test-csma-one-subnet.py	Mon Mar 31 16:03:44 2008 -0700
     1.2 +++ b/regression/tests/test-csma-one-subnet.py	Mon Mar 31 16:16:43 2008 -0700
     1.3 @@ -37,4 +37,5 @@
     1.4          os.system("./waf --cwd regression/traces --run " +
     1.5            testName + " >& /dev/null")
     1.6          
     1.7 -        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")
     1.8 +        return os.system("diff -q traces " + repoName + refDirName +
     1.9 +         " >& /dev/null")
     2.1 --- a/regression/tests/test-simple-point-to-point-olsr.py	Mon Mar 31 16:03:44 2008 -0700
     2.2 +++ b/regression/tests/test-simple-point-to-point-olsr.py	Mon Mar 31 16:16:43 2008 -0700
     2.3 @@ -37,4 +37,5 @@
     2.4          os.system("./waf --cwd regression/traces --run " +
     2.5            testName + " >& /dev/null")
     2.6          
     2.7 -        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")
     2.8 +        return os.system("diff -q traces " + repoName + refDirName +
     2.9 +         " >& /dev/null")
     3.1 --- a/regression/tests/test-simple-point-to-point.py	Mon Mar 31 16:03:44 2008 -0700
     3.2 +++ b/regression/tests/test-simple-point-to-point.py	Mon Mar 31 16:16:43 2008 -0700
     3.3 @@ -37,4 +37,5 @@
     3.4          os.system("./waf --cwd regression/traces --run " +
     3.5            testName + " >& /dev/null")
     3.6          
     3.7 -        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")
     3.8 +        return os.system("diff -q traces " + repoName + refDirName +
     3.9 +         " >& /dev/null")
     4.1 --- a/regression/tests/test-tcp-large-transfer.py	Mon Mar 31 16:03:44 2008 -0700
     4.2 +++ b/regression/tests/test-tcp-large-transfer.py	Mon Mar 31 16:16:43 2008 -0700
     4.3 @@ -37,4 +37,5 @@
     4.4          os.system("./waf --cwd regression/traces --run " +
     4.5            testName + " >& /dev/null")
     4.6          
     4.7 -        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")
     4.8 +        return os.system("diff -q traces " + repoName + refDirName +
     4.9 +         " >& /dev/null")
     5.1 --- a/regression/tests/test-tcp-nonlistening-server.py	Mon Mar 31 16:03:44 2008 -0700
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,31 +0,0 @@
     5.4 -#! /usr/bin/env python
     5.5 -
     5.6 -"""Regression test tcp-nonlistening-server."""
     5.7 -
     5.8 -import os
     5.9 -
    5.10 -def rmdir(dir):
    5.11 -    if os.path.exists(dir):
    5.12 -        files = os.listdir(dir)
    5.13 -        for file in files:
    5.14 -            if file == '.' or file == '..':
    5.15 -                continue
    5.16 -            path = dir + os.sep + file
    5.17 -            os.remove(path)
    5.18 -        os.rmdir(dir)
    5.19 -
    5.20 -def run(verbose, generate):
    5.21 -    """Execute a test."""
    5.22 -
    5.23 -    os.system("./waf --cwd regression/traces --run tcp-nonlistening-server >& /dev/null")
    5.24 -
    5.25 -    if generate:
    5.26 -        rmdir("knowns")
    5.27 -        os.rename("traces", "knowns")
    5.28 -        os.system("tar -cjf tests/test-tcp-nonlistening-server.bz2 knowns/")
    5.29 -        rmdir("knowns")
    5.30 -        return 0
    5.31 -    else:
    5.32 -        rmdir("knowns")
    5.33 -        os.system("tar -xjf tests/test-tcp-nonlistening-server.bz2 knowns/")
    5.34 -        return os.system("diff -q knowns traces >& /dev/null")
     6.1 --- a/regression/tests/test-udp-echo.py	Mon Mar 31 16:03:44 2008 -0700
     6.2 +++ b/regression/tests/test-udp-echo.py	Mon Mar 31 16:16:43 2008 -0700
     6.3 @@ -37,4 +37,5 @@
     6.4          os.system("./waf --cwd regression/traces --run " +
     6.5            testName + " >& /dev/null")
     6.6          
     6.7 -        return os.system("diff -q traces csma-one-subnet.ref >& /dev/null")
     6.8 +        return os.system("diff -q traces " + repoName + refDirName +
     6.9 +         " >& /dev/null")