* Someone imported a lot of files with the wrong CVS tag, so lots of files need

  that fixed in them....
* Keep unnecessary files out of the non-vendor part of this CVS repository.

1 files changed, 17 insertions, 6 deletions

diff --git a/contrib/ipfilter/test/logtest b/contrib/ipfilter/test/logtest
index 16abed9..1c8ac5bca 100755
--- a/contrib/ipfilter/test/logtest
+++ b/contrib/ipfilter/test/logtest
@@ -1,5 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
+format=$2
+mkdir -p results
 if [ -f /usr/ucb/touch ] ; then
 	TOUCH=/usr/ucb/touch
 else
@@ -13,25 +15,34 @@ else
 fi
 echo "$1...";
 
+case `uname -s` in
+OSF1)
+	GMT=:
+	;;
+*)
+	GMT=GMT
+	;;
+esac
+
 /bin/cp /dev/null results/$1
 /bin/cp /dev/null results/$1.b
 
 ( while read rule; do
 	echo $rule >> results/$1 
-	echo $rule | ../ipftest -br - -Hi input/$1 -l logout > /dev/null
+	echo $rule | ../ipftest -br - -F $format -i input/$1 -l logout > /dev/null
 	if [ $? -ne 0 ] ; then
 		/bin/rm -f logout
 		exit 1
 	fi
-	TZ=GMT ../ipmon -P /dev/null -f logout >> results/$1
+	TZ=$GMT ../ipmon -P /dev/null -f logout >> results/$1
         echo "--------" >> results/$1
-	TZ=GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
+	TZ=$GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
         echo "--------" >> results/$1.b
 done ) < regress/$1
-../ipftest -br regress/$1 -Hi input/$1 -l logout > /dev/null
-TZ=GMT ../ipmon -P /dev/null -f logout >> results/$1
+../ipftest -br regress/$1 -F $format -i input/$1 -l logout > /dev/null
+TZ=$GMT ../ipmon -P /dev/null -f logout >> results/$1
 echo "--------" >> results/$1
-TZ=GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
+TZ=$GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
 echo "--------" >> results/$1.b
 
 cmp expected/$1 results/$1