head	1.5;
access;
symbols
	RELENG_8_4:1.5.0.2
	RELENG_9_1_0_RELEASE:1.4.28.1.4.2
	RELENG_9_1:1.4.28.1.0.4
	RELENG_9_1_BP:1.4.28.1
	RELENG_8_3_0_RELEASE:1.4.22.1.8.1
	RELENG_8_3:1.4.22.1.0.8
	RELENG_8_3_BP:1.4.22.1
	RELENG_9_0_0_RELEASE:1.4.28.1.2.1
	RELENG_9_0:1.4.28.1.0.2
	RELENG_9_0_BP:1.4.28.1
	RELENG_9:1.4.0.28
	RELENG_9_BP:1.4
	RELENG_7_4_0_RELEASE:1.4.26.1
	RELENG_8_2_0_RELEASE:1.4.22.1.6.1
	RELENG_7_4:1.4.0.26
	RELENG_7_4_BP:1.4
	RELENG_8_2:1.4.22.1.0.6
	RELENG_8_2_BP:1.4.22.1
	RELENG_8_1_0_RELEASE:1.4.22.1.4.1
	RELENG_8_1:1.4.22.1.0.4
	RELENG_8_1_BP:1.4.22.1
	RELENG_7_3_0_RELEASE:1.4.24.1
	RELENG_7_3:1.4.0.24
	RELENG_7_3_BP:1.4
	RELENG_8_0_0_RELEASE:1.4.22.1.2.1
	RELENG_8_0:1.4.22.1.0.2
	RELENG_8_0_BP:1.4.22.1
	RELENG_8:1.4.0.22
	RELENG_8_BP:1.4
	RELENG_7_2_0_RELEASE:1.4.20.1
	RELENG_7_2:1.4.0.20
	RELENG_7_2_BP:1.4
	RELENG_7_1_0_RELEASE:1.4.18.1
	RELENG_6_4_0_RELEASE:1.4.16.1
	RELENG_7_1:1.4.0.18
	RELENG_7_1_BP:1.4
	RELENG_6_4:1.4.0.16
	RELENG_6_4_BP:1.4
	RELENG_7_0_0_RELEASE:1.4
	RELENG_6_3_0_RELEASE:1.4
	RELENG_7_0:1.4.0.14
	RELENG_7_0_BP:1.4
	RELENG_6_3:1.4.0.12
	RELENG_6_3_BP:1.4
	v4-1-28:1.1.1.3
	RELENG_7:1.4.0.10
	RELENG_7_BP:1.4
	v4-1-23:1.1.1.3
	RELENG_6_2_0_RELEASE:1.4
	RELENG_6_2:1.4.0.8
	RELENG_6_2_BP:1.4
	v4-1-13:1.1.1.3
	RELENG_5_5_0_RELEASE:1.3
	RELENG_5_5:1.3.0.16
	RELENG_5_5_BP:1.3
	RELENG_6_1_0_RELEASE:1.4
	RELENG_6_1:1.4.0.6
	RELENG_6_1_BP:1.4
	v4-1-10:1.1.1.3
	RELENG_6_0_0_RELEASE:1.4
	RELENG_6_0:1.4.0.4
	RELENG_6_0_BP:1.4
	RELENG_6:1.4.0.2
	RELENG_6_BP:1.4
	RELENG_5_4_0_RELEASE:1.3
	v4-1-8:1.1.1.3
	RELENG_5_4:1.3.0.14
	RELENG_5_4_BP:1.3
	RELENG_4_11_0_RELEASE:1.3.2.1
	RELENG_4_11:1.3.2.1.0.12
	RELENG_4_11_BP:1.3.2.1
	RELENG_5_3_0_RELEASE:1.3
	RELENG_5_3:1.3.0.12
	RELENG_5_3_BP:1.3
	RELENG_5:1.3.0.10
	RELENG_5_BP:1.3
	v3-4-35:1.1.1.2
	RELENG_4_10_0_RELEASE:1.3.2.1
	RELENG_4_10:1.3.2.1.0.10
	RELENG_4_10_BP:1.3.2.1
	RELENG_5_2_1_RELEASE:1.3
	RELENG_5_2_0_RELEASE:1.3
	RELENG_5_2:1.3.0.8
	RELENG_5_2_BP:1.3
	RELENG_4_9_0_RELEASE:1.3.2.1
	RELENG_4_9:1.3.2.1.0.8
	RELENG_4_9_BP:1.3.2.1
	RELENG_5_1_0_RELEASE:1.3
	RELENG_5_1:1.3.0.6
	RELENG_5_1_BP:1.3
	RELENG_4_8_0_RELEASE:1.3.2.1
	RELENG_4_8:1.3.2.1.0.6
	RELENG_4_8_BP:1.3.2.1
	v3-4-31:1.1.1.2
	RELENG_5_0_0_RELEASE:1.3
	RELENG_5_0:1.3.0.4
	RELENG_5_0_BP:1.3
	RELENG_4_7_0_RELEASE:1.3.2.1
	RELENG_4_7:1.3.2.1.0.4
	RELENG_4_7_BP:1.3.2.1
	v3-4-29:1.1.1.2
	RELENG_4_6_2_RELEASE:1.3.2.1
	RELENG_4_6_1_RELEASE:1.3.2.1
	RELENG_4_6_0_RELEASE:1.3.2.1
	v3-4-28:1.1.1.2
	RELENG_4_6:1.3.2.1.0.2
	RELENG_4_6_BP:1.3.2.1
	RELENG_4:1.3.0.2
	v3-4-27:1.1.1.2
	v3-4-26:1.1.1.2
	v3-4-25:1.1.1.1
	DARRENR:1.1.1;
locks; strict;
comment	@# @;


1.5
date	2012.11.17.01.48.47;	author svnexp;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2005.04.25.18.20.15;	author darrenr;	state Exp;
branches
	1.4.2.1
	1.4.10.1
	1.4.16.1
	1.4.18.1
	1.4.20.1
	1.4.22.1
	1.4.24.1
	1.4.26.1
	1.4.28.1;
next	1.3;

1.3
date	2002.04.25.03.36.26;	author darrenr;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2002.03.19.15.17.06;	author darrenr;	state Exp;
branches;
next	1.1;

1.1
date	2002.03.19.11.45.20;	author darrenr;	state Exp;
branches
	1.1.1.1;
next	;

1.5.2.1
date	2012.11.17.01.48.47;	author svnexp;	state dead;
branches;
next	1.5.2.2;

1.5.2.2
date	2013.03.28.13.01.21;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2012.11.17.07.38.50;	author svnexp;	state Exp;
branches;
next	;

1.4.10.1
date	2012.11.17.08.01.04;	author svnexp;	state Exp;
branches;
next	;

1.4.16.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.4.18.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.4.20.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.4.22.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.4.22.1.2.1
	1.4.22.1.4.1
	1.4.22.1.6.1
	1.4.22.1.8.1;
next	1.4.22.2;

1.4.22.2
date	2012.11.17.10.35.52;	author svnexp;	state Exp;
branches;
next	;

1.4.22.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.4.22.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.4.22.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.4.22.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.4.22.1.8.2;

1.4.22.1.8.2
date	2012.11.17.08.24.34;	author svnexp;	state Exp;
branches;
next	;

1.4.24.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.4.26.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.4.26.2;

1.4.26.2
date	2012.11.17.08.16.34;	author svnexp;	state Exp;
branches;
next	;

1.4.28.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.4.28.1.2.1
	1.4.28.1.4.1;
next	1.4.28.2;

1.4.28.2
date	2012.11.17.11.36.06;	author svnexp;	state Exp;
branches;
next	;

1.4.28.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.4.28.1.2.2;

1.4.28.1.2.2
date	2012.11.17.08.36.08;	author svnexp;	state Exp;
branches;
next	;

1.4.28.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.4.28.1.4.2;

1.4.28.1.4.2
date	2012.11.17.08.46.56;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2002.04.27.17.31.02;	author darrenr;	state Exp;
branches;
next	;

1.1.1.1
date	2002.03.19.11.45.20;	author darrenr;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2002.04.25.03.34.24;	author darrenr;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2005.04.25.17.31.26;	author darrenr;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Switching exporter and resync
@
text
@#!/bin/sh
# $FreeBSD: head/contrib/ipfilter/test/logtest 145519 2005-04-25 18:20:15Z darrenr $
format=$2
mkdir -p results
if [ -f /usr/ucb/touch ] ; then
	TOUCH=/usr/ucb/touch
else
	if [ -f /usr/bin/touch ] ; then
		TOUCH=/usr/bin/touch
	else
		if [ -f /bin/touch ] ; then
			TOUCH=/bin/touch
		fi
	fi
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 - -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
        echo "--------" >> results/$1
	TZ=$GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
        echo "--------" >> results/$1.b
done ) < regress/$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
echo "--------" >> results/$1.b

cmp expected/$1 results/$1
status=$?
if [ $status -ne 0 ] ; then
	exit $status
fi
cmp expected/$1.b results/$1.b
status=$?
if [ $status -ne 0 ] ; then
	exit $status
fi
/bin/rm -f logout
$TOUCH $1
exit 0
@


1.5.2.1
log
@file logtest was added on branch RELENG_8_4 on 2013-03-28 13:01:21 +0000
@
text
@d1 60
@


1.5.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 60
#!/bin/sh
# $FreeBSD: releng/8.4/contrib/ipfilter/test/logtest 145519 2005-04-25 18:20:15Z darrenr $
format=$2
mkdir -p results
if [ -f /usr/ucb/touch ] ; then
	TOUCH=/usr/ucb/touch
else
	if [ -f /usr/bin/touch ] ; then
		TOUCH=/usr/bin/touch
	else
		if [ -f /bin/touch ] ; then
			TOUCH=/bin/touch
		fi
	fi
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 - -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
        echo "--------" >> results/$1
	TZ=$GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
        echo "--------" >> results/$1.b
done ) < regress/$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
echo "--------" >> results/$1.b

cmp expected/$1 results/$1
status=$?
if [ $status -ne 0 ] ; then
	exit $status
fi
cmp expected/$1.b results/$1.b
status=$?
if [ $status -ne 0 ] ; then
	exit $status
fi
/bin/rm -f logout
$TOUCH $1
exit 0
@


1.4
log
@* 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.
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.4.10.1
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/7/contrib/ipfilter/test/logtest 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.4.2.1
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/6/contrib/ipfilter/test/logtest 147906 2005-07-11 04:14:43Z cvs2svn $
@


1.4.28.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.4.28.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/contrib/ipfilter/test/logtest 145519 2005-04-25 18:20:15Z darrenr $
@


1.4.28.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.4.28.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/contrib/ipfilter/test/logtest 145519 2005-04-25 18:20:15Z darrenr $
@


1.4.28.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.4.28.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/contrib/ipfilter/test/logtest 145519 2005-04-25 18:20:15Z darrenr $
@


1.4.26.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.4.26.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/7.4/contrib/ipfilter/test/logtest 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.4.24.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.4.22.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.4.22.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/contrib/ipfilter/test/logtest 145519 2005-04-25 18:20:15Z darrenr $
@


1.4.22.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.4.22.1.8.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/contrib/ipfilter/test/logtest 145519 2005-04-25 18:20:15Z darrenr $
@


1.4.22.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.4.22.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.4.22.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.4.20.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.4.18.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.4.16.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.3
log
@resolve conflicts from import
@
text
@d3 2
d18 9
d32 1
a32 1
	echo $rule | ../ipftest -br - -Hi input/$1 -l logout > /dev/null
d37 1
a37 1
	TZ=GMT ../ipmon -P /dev/null -f logout >> results/$1
d39 1
a39 1
	TZ=GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
d42 2
a43 2
../ipftest -br regress/$1 -Hi input/$1 -l logout > /dev/null
TZ=GMT ../ipmon -P /dev/null -f logout >> results/$1
d45 1
a45 1
TZ=GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
@


1.3.2.1
log
@Update (finally) IPFilter on RELENG_4 CVS branch.
@
text
@d2 1
@


1.2
log
@For this regression test to pass, you must run ipmon in the Australia/Victoria
(EST-10) timezone to generate the correct timestamps in output.
@
text
@d26 1
a26 1
	TZ=Australia/Victoria ../ipmon -P /dev/null -f logout >> results/$1
d28 1
a28 1
	TZ=Australia/Victoria ../ipmon -P /dev/null -bf logout >> results/$1.b
d32 1
a32 1
TZ=Australia/Victoria ../ipmon -P /dev/null -f logout >> results/$1
d34 1
a34 1
TZ=Australia/Victoria ../ipmon -P /dev/null -bf logout >> results/$1.b
@


1.1
log
@Initial revision
@
text
@d2 1
d26 1
a26 1
	../ipmon -P /dev/null -f logout >> results/$1
d28 1
a28 1
	../ipmon -P /dev/null -bf logout >> results/$1.b
d32 1
a32 1
../ipmon -P /dev/null -f logout >> results/$1
d34 1
a34 1
../ipmon -P /dev/null -bf logout >> results/$1.b
@


1.1.1.1
log
@Import IPFilter 3.4.25

@
text
@@


1.1.1.2
log
@Import IPFilter 3.4.26
@
text
@d25 1
a25 1
	TZ=GMT ../ipmon -P /dev/null -f logout >> results/$1
d27 1
a27 1
	TZ=GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
d31 1
a31 1
TZ=GMT ../ipmon -P /dev/null -f logout >> results/$1
d33 1
a33 1
TZ=GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
@


1.1.1.3
log
@import ipfilter 4.1.8 into the vendor branch
@
text
@a1 2
format=$2
mkdir -p results
a14 9
case `uname -s` in
OSF1)
	GMT=:
	;;
*)
	GMT=GMT
	;;
esac

d20 1
a20 1
	echo $rule | ../ipftest -br - -F $format -i input/$1 -l logout > /dev/null
d25 1
a25 1
	TZ=$GMT ../ipmon -P /dev/null -f logout >> results/$1
d27 1
a27 1
	TZ=$GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
d30 2
a31 2
../ipftest -br regress/$1 -F $format -i input/$1 -l logout > /dev/null
TZ=$GMT ../ipmon -P /dev/null -f logout >> results/$1
d33 1
a33 1
TZ=$GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
@


