svn commit: r263226 - in head: etc/mtree tools/regression/usr.bin tools/regression/usr.bin/lastcomm tools/regression/usr.sbin usr.bin/lastcomm usr.bin/lastcomm/tests usr.sbin usr.sbin/etcupdate usr...

Julio Merino jmmv at FreeBSD.org
Sun Mar 16 04:09:25 UTC 2014 

Author: jmmv
Date: Sun Mar 16 04:09:22 2014
New Revision: 263226
URL: http://svnweb.freebsd.org/changeset/base/263226

Log:
  Migrate tools/regression/{usr.bin/lastcomm,usr.sbin}/ to the new tests layout.
  
  This change was originally going to only migrate the usr.sbin tests but, as
  it turns out, the usr.sbin/sa/ tests require files from usr.bin/lastcomm/
  so it's better to just also migrate the latter at the same time.  The other
  usr.bin tests will be moved separately.
  
  To make these tests work within the test suite, some of them have required
  changes to prevent modifying the source directory and instead just rely on
  the current directory for file manipulation.

Added:
  head/usr.bin/lastcomm/tests/
     - copied from r263225, head/tools/regression/usr.bin/lastcomm/
  head/usr.bin/lastcomm/tests/legacy_test.sh   (contents, props changed)
     - copied, changed from r263225, head/tools/regression/usr.bin/lastcomm/regress.t
  head/usr.sbin/etcupdate/tests/
     - copied from r263221, head/tools/regression/usr.sbin/etcupdate/
  head/usr.sbin/etcupdate/tests/Makefile   (contents, props changed)
     - copied unchanged from r263221, head/tools/regression/usr.sbin/etcupdate/always.sh
     - copied unchanged from r263221, head/tools/regression/usr.sbin/etcupdate/conflicts.sh
     - copied unchanged from r263221, head/tools/regression/usr.sbin/etcupdate/fbsdid.sh
     - copied unchanged from r263221, head/tools/regression/usr.sbin/etcupdate/ignore.sh
     - copied unchanged from r263221, head/tools/regression/usr.sbin/etcupdate/preworld.sh
     - copied unchanged from r263221, head/tools/regression/usr.sbin/etcupdate/tests.sh
     - copied unchanged from r263221, head/tools/regression/usr.sbin/etcupdate/tzsetup.sh
  head/usr.sbin/newsyslog/tests/
     - copied from r263221, head/tools/regression/usr.sbin/newsyslog/
  head/usr.sbin/newsyslog/tests/legacy_test.sh   (contents, props changed)
     - copied, changed from r263221, head/tools/regression/usr.sbin/newsyslog/regress.sh
  head/usr.sbin/sa/tests/
     - copied from r263221, head/tools/regression/usr.sbin/sa/
  head/usr.sbin/sa/tests/legacy_test.sh   (contents, props changed)
     - copied, changed from r263221, head/tools/regression/usr.sbin/sa/regress.t
  head/usr.sbin/tests/
  head/usr.sbin/tests/Makefile   (contents, props changed)
Directory Properties:
  head/usr.sbin/etcupdate/tests/always_test.sh   (props changed)
  head/usr.sbin/etcupdate/tests/conflicts_test.sh   (props changed)
  head/usr.sbin/etcupdate/tests/fbsdid_test.sh   (props changed)
  head/usr.sbin/etcupdate/tests/ignore_test.sh   (props changed)
  head/usr.sbin/etcupdate/tests/preworld_test.sh   (props changed)
  head/usr.sbin/etcupdate/tests/tests_test.sh   (props changed)
  head/usr.sbin/etcupdate/tests/tzsetup_test.sh   (props changed)
Deleted:
  head/tools/regression/usr.bin/lastcomm/
  head/tools/regression/usr.sbin/
  head/usr.bin/lastcomm/tests/regress.t
  head/usr.sbin/etcupdate/tests/always.sh
  head/usr.sbin/etcupdate/tests/conflicts.sh
  head/usr.sbin/etcupdate/tests/fbsdid.sh
  head/usr.sbin/etcupdate/tests/ignore.sh
  head/usr.sbin/etcupdate/tests/preworld.sh
  head/usr.sbin/etcupdate/tests/tests.sh
  head/usr.sbin/etcupdate/tests/tzsetup.sh
  head/usr.sbin/newsyslog/tests/regress.sh
  head/usr.sbin/newsyslog/tests/regress.t
  head/usr.sbin/sa/tests/regress.t
Modified:
  head/etc/mtree/BSD.tests.dist
  head/tools/regression/usr.bin/Makefile
  head/usr.bin/lastcomm/Makefile
  head/usr.bin/lastcomm/tests/Makefile
  head/usr.bin/lastcomm/tests/values.sh   (contents, props changed)
  head/usr.sbin/Makefile
  head/usr.sbin/etcupdate/Makefile
  head/usr.sbin/newsyslog/Makefile
  head/usr.sbin/newsyslog/tests/Makefile
  head/usr.sbin/sa/Makefile
  head/usr.sbin/sa/tests/Makefile
  head/usr.sbin/sa/tests/prime.sh   (contents, props changed)

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Sun Mar 16 03:32:29 2014	(r263225)
+++ head/etc/mtree/BSD.tests.dist	Sun Mar 16 04:09:22 2014	(r263226)
@@ -95,6 +95,16 @@
                 atf-sh
                 ..
             ..
+            lastcomm
+            ..
+        ..
+        usr.sbin
+            etcupdate
+            ..
+            newsyslog
+            ..
+            sa
+            ..
         ..
     ..
 ..

Modified: head/tools/regression/usr.bin/Makefile
==============================================================================
--- head/tools/regression/usr.bin/Makefile	Sun Mar 16 03:32:29 2014	(r263225)
+++ head/tools/regression/usr.bin/Makefile	Sun Mar 16 04:09:22 2014	(r263226)
@@ -2,8 +2,5 @@
 
 SUBDIR=	apply calendar comm file2c join jot m4 ncal printf sed tr	\
 	uudecode uuencode xargs
-.if !defined(AUTOMATED)
-SUBDIR+= lastcomm
-.endif
 
 .include <bsd.subdir.mk>

Modified: head/usr.bin/lastcomm/Makefile
==============================================================================
--- head/usr.bin/lastcomm/Makefile	Sun Mar 16 03:32:29 2014	(r263225)
+++ head/usr.bin/lastcomm/Makefile	Sun Mar 16 04:09:22 2014	(r263226)
@@ -1,7 +1,13 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	lastcomm
 SRCS=	lastcomm.c readrec.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: head/usr.bin/lastcomm/tests/Makefile
==============================================================================
--- head/tools/regression/usr.bin/lastcomm/Makefile	Sun Mar 16 03:32:29 2014	(r263225)
+++ head/usr.bin/lastcomm/tests/Makefile	Sun Mar 16 04:09:22 2014	(r263226)
@@ -1,6 +1,21 @@
 # $FreeBSD$
 
-all: regress
+TESTSDIR=	${TESTSBASE}/usr.bin/lastcomm
 
-regress: regress.t
-	./regress.t
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		v1-amd64-acct.in
+FILES+=		v1-amd64.out
+FILES+=		v1-i386-acct.in
+FILES+=		v1-i386.out
+FILES+=		v1-sparc64-acct.in
+FILES+=		v1-sparc64.out
+FILES+=		v2-amd64-acct.in
+FILES+=		v2-amd64.out
+FILES+=		v2-i386-acct.in
+FILES+=		v2-i386.out
+FILES+=		v2-sparc64-acct.in
+FILES+=		v2-sparc64.out
+
+.include <bsd.test.mk>

Copied and modified: head/usr.bin/lastcomm/tests/legacy_test.sh (from r263225, head/tools/regression/usr.bin/lastcomm/regress.t)
==============================================================================
--- head/tools/regression/usr.bin/lastcomm/regress.t	Sun Mar 16 03:32:29 2014	(r263225, copy source)
+++ head/usr.bin/lastcomm/tests/legacy_test.sh	Sun Mar 16 04:09:22 2014	(r263226)
@@ -14,7 +14,7 @@ check()
 	shift
 	# Remove tty field, which varies between systems.
 	awk '{$4 = ""; print}' |
-	if diff -q - $DIR/$1
+	if diff -q - $1
 	then
 		echo "ok $NUM"
 	else
@@ -23,19 +23,16 @@ check()
 }
 
 
-cat $DIR/v1-$ARCH-acct.in $DIR/v2-$ARCH-acct.in >$DIR/v1v2-$ARCH-acct.in
-cat $DIR/v2-$ARCH.out $DIR/v1-$ARCH.out >$DIR/v1v2-$ARCH.out
+cat $DIR/v1-$ARCH-acct.in $DIR/v2-$ARCH-acct.in >v1v2-$ARCH-acct.in
+cat $DIR/v2-$ARCH.out $DIR/v1-$ARCH.out >v1v2-$ARCH.out
 
 echo 1..6
 
-lastcomm -cesuS -f $DIR/v1-$ARCH-acct.in | check 1 v1-$ARCH.out
-lastcomm -cesuS -f - <$DIR/v1-$ARCH-acct.in | tail -r | check 2 v1-$ARCH.out
-lastcomm -cesuS -f $DIR/v2-$ARCH-acct.in | check 3 v2-$ARCH.out
-lastcomm -cesuS -f - <$DIR/v2-$ARCH-acct.in | tail -r | check 4 v2-$ARCH.out
-lastcomm -cesuS -f $DIR/v1v2-$ARCH-acct.in | check 5 v1v2-$ARCH.out
-lastcomm -cesuS -f - <$DIR/v1v2-$ARCH-acct.in | tail -r | check 6 v1v2-$ARCH.out
-
-rm $DIR/v1v2-$ARCH-acct.in
-rm $DIR/v1v2-$ARCH.out
+lastcomm -cesuS -f $DIR/v1-$ARCH-acct.in | check 1 $DIR/v1-$ARCH.out
+lastcomm -cesuS -f - <$DIR/v1-$ARCH-acct.in | tail -r | check 2 $DIR/v1-$ARCH.out
+lastcomm -cesuS -f $DIR/v2-$ARCH-acct.in | check 3 $DIR/v2-$ARCH.out
+lastcomm -cesuS -f - <$DIR/v2-$ARCH-acct.in | tail -r | check 4 $DIR/v2-$ARCH.out
+lastcomm -cesuS -f v1v2-$ARCH-acct.in | check 5 v1v2-$ARCH.out
+lastcomm -cesuS -f - <v1v2-$ARCH-acct.in | tail -r | check 6 v1v2-$ARCH.out
 
 exit 0

Modified: head/usr.bin/lastcomm/tests/values.sh
==============================================================================
--- head/tools/regression/usr.bin/lastcomm/values.sh	Sun Mar 16 03:32:29 2014	(r263225)
+++ head/usr.bin/lastcomm/tests/values.sh	Sun Mar 16 04:09:22 2014	(r263226)
@@ -6,6 +6,7 @@
 ACCT=acct
 RESULTS=acct.`uname -m`.tar.gz
 TMPDIR=$$.tmp
+TZ=UTC; export TZ
 
 run()
 {

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Sun Mar 16 03:32:29 2014	(r263225)
+++ head/usr.sbin/Makefile	Sun Mar 16 04:09:22 2014	(r263226)
@@ -284,6 +284,10 @@ SUBDIR+=	praliases
 SUBDIR+=	sendmail
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .if ${MK_TOOLCHAIN} != "no"
 SUBDIR+=	config
 SUBDIR+=	crunch

Modified: head/usr.sbin/etcupdate/Makefile
==============================================================================
--- head/usr.sbin/etcupdate/Makefile	Sun Mar 16 03:32:29 2014	(r263225)
+++ head/usr.sbin/etcupdate/Makefile	Sun Mar 16 04:09:22 2014	(r263226)
@@ -1,6 +1,12 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 SCRIPTS=etcupdate.sh
 MAN=	etcupdate.8
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Added: head/usr.sbin/etcupdate/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/etcupdate/tests/Makefile	Sun Mar 16 04:09:22 2014	(r263226)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.sbin/etcupdate
+
+PLAIN_TESTS_SH=
+.for test in	always_test \
+		conflicts_test \
+		fbsdid_test \
+		ignore_test \
+		preworld_test \
+		tests_test \
+		tzsetup_test
+PLAIN_TESTS_SH+=	${test}
+TEST_METADATA.${test}+=	required_user="root"
+.endfor
+
+.include <bsd.test.mk>

Copied: head/usr.sbin/etcupdate/tests/always_test.sh (from r263221, head/tools/regression/usr.sbin/etcupdate/always.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/etcupdate/tests/always_test.sh	Sun Mar 16 04:09:22 2014	(r263226, copy of r263221, head/tools/regression/usr.sbin/etcupdate/always.sh)
@@ -0,0 +1,630 @@
+#!/bin/sh
+#
+# Copyright (c) 2010 Advanced Computing Technologies LLC
+# Written by: John H. Baldwin <jhb at FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+# Various regression tests to test the -A flag to the 'update' command.
+
+FAILED=no
+WORKDIR=work
+
+usage()
+{
+	echo "Usage: always.sh [-s script] [-w workdir]"
+	exit 1
+}
+
+# Allow the user to specify an alternate work directory or script.
+COMMAND=etcupdate
+while getopts "s:w:" option; do
+	case $option in
+		s)
+			COMMAND="sh $OPTARG"
+			;;
+		w)
+			WORKDIR=$OPTARG
+			;;
+		*)
+			echo
+			usage
+			;;
+	esac
+done
+shift $((OPTIND - 1))
+if [ $# -ne 0 ]; then
+	usage
+fi
+
+CONFLICTS=$WORKDIR/conflicts
+OLD=$WORKDIR/old
+NEW=$WORKDIR/current
+TEST=$WORKDIR/test
+
+# The various states of the comparison of a file between two trees.
+states="equal first second difftype difflinks difffiles"
+
+# These tests deal with ignoring certain patterns of files.  We run
+# the test multiple times forcing the install of different patterns.
+build_trees()
+{
+	local i
+
+	rm -rf $OLD $NEW $TEST $CONFLICTS
+
+	for i in $states; do
+		for j in $states; do
+			for k in $states; do
+				mkdir -p $OLD/$i/$j/$k $NEW/$i/$j/$k \
+				    $TEST/$i/$j/$k
+			done
+		done
+	done
+
+	# What follows are the various warning/conflict cases from the
+	# larger regression tests.  These results of many of these
+	# tests should be changed when installation is forced.  The
+	# cases when these updates should still fail even when forced
+	# are: 1) it should not force the removal of a modified file
+	# and 2) it should not remove a subdirectory that contains a
+	# modified or added file.
+
+	# /first/difftype/second: File with different local type
+	# removed.  Should generate a warning.
+	mkfifo $OLD/first/difftype/second/fifo
+	mkdir $TEST/first/difftype/second/fifo
+
+	# /first/difflinks/second: Modified link removed.  Should
+	# generate a warning.
+	ln -s "old link" $OLD/first/difflinks/second/link
+	ln -s "test link" $TEST/first/difflinks/second/link
+
+	# /first/difffiles/second: Modified file removed.  Should
+	# generate a warning.
+	echo "foo" > $OLD/first/difffiles/second/file
+	echo "bar" > $TEST/first/difffiles/second/file
+
+	# /second/second/difftype: Newly added file conflicts with
+	# existing file in test tree of a different type.  Should
+	# generate a warning.
+	mkdir $NEW/second/second/difftype/dir
+	mkfifo $TEST/second/second/difftype/dir
+
+	# /second/second/difflinks: Newly added link conflicts with
+	# existing link in test tree.  Should generate a warning.
+	ln -s "new link" $NEW/second/second/difflinks/link
+	ln -s "test link" $TEST/second/second/difflinks/link
+
+	# /second/second/difffiles: Newly added file conflicts with
+	# existing file in test tree.  Should generate a warning.
+	echo "new" > $NEW/second/second/difffiles/file
+	echo "test" > $TEST/second/second/difffiles/file
+
+	# /difftype/first/first: A removed file has changed type.
+	# This should generate a warning.
+	mkfifo $OLD/difftype/first/first/fifo
+	mkdir $NEW/difftype/first/first/fifo
+
+	# /difftype/difftype/difftype: All three files (old, new, and
+	# test) are different types from each other.  This should
+	# generate a warning.
+	mkfifo $OLD/difftype/difftype/difftype/one
+	mkdir $NEW/difftype/difftype/difftype/one
+	echo "foo" > $TEST/difftype/difftype/difftype/one
+	mkdir $OLD/difftype/difftype/difftype/two
+	echo "baz" > $NEW/difftype/difftype/difftype/two
+	ln -s "bar" $TEST/difftype/difftype/difftype/two
+
+	# /difftype/difftype/difflinks: A file has changed from a
+	# non-link to a link in both the new and test trees, but the
+	# target of the new and test links differ.  This should
+	# generate a new link conflict.
+	mkfifo $OLD/difftype/difftype/difflinks/link
+	ln -s "new" $NEW/difftype/difftype/difflinks/link
+	ln -s "test" $TEST/difftype/difftype/difflinks/link
+
+	# /difftype/difftype/difffile: A file has changed from a
+	# non-regular file to a regular file in both the new and test
+	# trees, but the contents in the new and test files differ.
+	# This should generate a new file conflict.
+	ln -s "old" $OLD/difftype/difftype/difffiles/file
+	echo "foo" > $NEW/difftype/difftype/difffiles/file
+	echo "bar" > $TEST/difftype/difftype/difffiles/file
+
+	# /difflinks/first/first: A modified link is missing in the
+	# test tree.  This should generate a warning.
+	ln -s "old" $OLD/difflinks/first/first/link
+	ln -s "new" $NEW/difflinks/first/first/link
+
+	# /difflinks/difftype/difftype: An updated link has been
+	# changed to a different file type in the test tree.  This
+	# should generate a warning.
+	ln -s "old" $OLD/difflinks/difftype/difftype/link
+	ln -s "new" $NEW/difflinks/difftype/difftype/link
+	echo "test" > $TEST/difflinks/difftype/difftype/link
+
+	# /difflinks/difflinks/difflinks: An updated link has been
+	# modified in the test tree and doesn't match either the old
+	# or new links.  This should generate a warning.
+	ln -s "old" $OLD/difflinks/difflinks/difflinks/link
+	ln -s "new" $NEW/difflinks/difflinks/difflinks/link
+	ln -s "test" $TEST/difflinks/difflinks/difflinks/link
+
+	# /difffiles/first/first: A removed file has been changed in
+	# the new tree.  This should generate a warning.
+	echo "foo" > $OLD/difffiles/first/first/file
+	echo "bar" > $NEW/difffiles/first/first/file
+
+	# /difffiles/difftype/difftype: An updated regular file has
+	# been changed to a different file type in the test tree.
+	# This should generate a warning.
+	echo "old" > $OLD/difffiles/difftype/difftype/file
+	echo "new" > $NEW/difffiles/difftype/difftype/file
+	mkfifo $TEST/difffiles/difftype/difftype/file
+
+	# /difffiles/difffiles/difffiles: A modified regular file was
+	# updated in the new tree.  The changes should be merged into
+	# to the new file if possible.  If the merge fails, a conflict
+	# should be generated.  For this test we just include the
+	# conflict case.
+	cat > $OLD/difffiles/difffiles/difffiles/conflict <<EOF
+this is an old file
+EOF
+	cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
+this is a new file
+EOF
+	cat > $TEST/difffiles/difffiles/difffiles/conflict <<EOF
+this is a test file
+EOF
+
+	## Tests for adding directories
+	mkdir -p $OLD/adddir $NEW/adddir $TEST/adddir
+
+	# /adddir/conflict: Add a new file in a directory that already
+	# exists as a file.  This should generate two warnings.
+	mkdir $NEW/adddir/conflict
+	touch $NEW/adddir/conflict/newfile
+	touch $TEST/adddir/conflict
+
+	## Tests for removing directories
+	mkdir -p $OLD/rmdir $NEW/rmdir $TEST/rmdir
+
+	# /rmdir/extra: Do not remove a directory with an extra local file.
+	# This should generate a warning.
+	for i in $OLD $TEST; do
+		mkdir $i/rmdir/extra
+	done
+	echo "foo" > $TEST/rmdir/extra/localfile.txt
+
+	# /rmdir/conflict: Do not remove a directory with a conflicted
+	# remove file.  This should generate a warning.
+	for i in $OLD $TEST; do
+		mkdir $i/rmdir/conflict
+	done
+	mkfifo $OLD/rmdir/conflict/difftype
+	mkdir $TEST/rmdir/conflict/difftype
+
+	## Tests for converting files to directories and vice versa
+	for i in $OLD $NEW $TEST; do
+		for j in already old fromdir todir; do
+			mkdir -p $i/dirchange/$j
+		done
+	done
+
+	# /dirchange/fromdir/extradir: Convert a directory tree to a
+	# file.  The test tree includes an extra file in the directory
+	# that is not present in the old tree.  This should generate a
+	# warning.
+	for i in $OLD $TEST; do
+		mkdir $i/dirchange/fromdir/extradir
+		echo "foo" > $i/dirchange/fromdir/extradir/file
+	done
+	mkfifo $TEST/dirchange/fromdir/extradir/fifo
+	ln -s "bar" $NEW/dirchange/fromdir/extradir
+
+	# /dirchange/fromdir/conflict: Convert a directory tree to a
+	# file.  The test tree includes a local change that generates
+	# a warning and prevents the removal of the directory.
+	for i in $OLD $TEST; do
+		mkdir $i/dirchange/fromdir/conflict
+	done
+	echo "foo" > $OLD/dirchange/fromdir/conflict/somefile
+	echo "bar" > $TEST/dirchange/fromdir/conflict/somefile
+	mkfifo $NEW/dirchange/fromdir/conflict
+
+	# /dirchange/todir/difffile: Convert a file to a directory
+	# tree.  The test tree has a locally modified version of the
+	# file so that the conversion fails with a warning.
+	echo "foo" > $OLD/dirchange/todir/difffile
+	mkdir $NEW/dirchange/todir/difffile
+	echo "baz" > $NEW/dirchange/todir/difffile/file
+	echo "bar" > $TEST/dirchange/todir/difffile
+
+	# /dirchange/todir/difftype: Similar to the previous test, but
+	# the conflict is due to a change in the file type.
+	echo "foo" > $OLD/dirchange/todir/difftype
+	mkdir $NEW/dirchange/todir/difftype
+	echo "baz" > $NEW/dirchange/todir/difftype/file
+	mkfifo $TEST/dirchange/todir/difftype
+}
+
+# $1 - relative path to file that should be missing from TEST
+missing()
+{
+	if [ -e $TEST/$1 -o -L $TEST/$1 ]; then
+		echo "File $1 should be missing"
+		FAILED=yes
+	fi
+}
+
+# $1 - relative path to file that should be present in TEST
+present()
+{
+	if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then
+		echo "File $1 should be present"
+		FAILED=yes
+	fi
+}
+
+# $1 - relative path to file that should be a fifo in TEST
+fifo()
+{
+	if ! [ -p $TEST/$1 ]; then
+		echo "File $1 should be a FIFO"
+		FAILED=yes
+	fi
+}
+
+# $1 - relative path to file that should be a directory in TEST
+dir()
+{
+	if ! [ -d $TEST/$1 ]; then
+		echo "File $1 should be a directory"
+		FAILED=yes
+	fi
+}
+
+# $1 - relative path to file that should be a symlink in TEST
+# $2 - optional value of the link
+link()
+{
+	local val
+
+	if ! [ -L $TEST/$1 ]; then
+		echo "File $1 should be a link"
+		FAILED=yes
+	elif [ $# -gt 1 ]; then
+		val=`readlink $TEST/$1`
+		if [ "$val" != "$2" ]; then
+			echo "Link $1 should link to \"$2\""
+			FAILED=yes
+		fi
+	fi
+}
+
+# $1 - relative path to regular file that should be present in TEST
+# $2 - optional string that should match file contents
+# $3 - optional MD5 of the flie contents, overrides $2 if present
+file()
+{
+	local contents sum
+
+	if ! [ -f $TEST/$1 ]; then
+		echo "File $1 should be a regular file"
+		FAILED=yes
+	elif [ $# -eq 2 ]; then
+		contents=`cat $TEST/$1`
+		if [ "$contents" != "$2" ]; then
+			echo "File $1 has wrong contents"
+			FAILED=yes
+		fi
+	elif [ $# -eq 3 ]; then
+		sum=`md5 -q $TEST/$1`
+		if [ "$sum" != "$3" ]; then
+			echo "File $1 has wrong contents"
+			FAILED=yes
+		fi
+	fi
+}
+
+# $1 - relative path to a regular file that should have a conflict
+# $2 - optional MD5 of the conflict file contents
+conflict()
+{
+	local sum
+
+	if ! [ -f $CONFLICTS/$1 ]; then
+		echo "File $1 missing conflict"
+		FAILED=yes
+	elif [ $# -gt 1 ]; then
+		sum=`md5 -q $CONFLICTS/$1`
+		if [ "$sum" != "$2" ]; then
+			echo "Conflict $1 has wrong contents"
+			FAILED=yes
+		fi
+	fi
+}
+
+# $1 - relative path to a regular file that should not have a conflict
+noconflict()
+{
+	if [ -f $CONFLICTS/$1 ]; then
+		echo "File $1 should not have a conflict"
+		FAILED=yes
+	fi
+}
+
+if [ `id -u` -ne 0 ]; then
+	echo "must be root"
+	exit 0
+fi
+
+if [ -r /etc/etcupdate.conf ]; then
+	echo "WARNING: /etc/etcupdate.conf settings may break some tests."
+fi
+
+# First run the test ignoring no patterns.
+
+build_trees
+
+$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
+
+cat > $WORKDIR/correct.out <<EOF
+  D /dirchange/fromdir/extradir/file
+  C /difffiles/difffiles/difffiles/conflict
+  C /difftype/difftype/difffiles/file
+  C /second/second/difffiles/file
+Warnings:
+  Modified regular file remains: /dirchange/fromdir/conflict/somefile
+  Modified regular file remains: /first/difffiles/second/file
+  Modified symbolic link remains: /first/difflinks/second/link
+  Modified directory remains: /first/difftype/second/fifo
+  Modified directory remains: /rmdir/conflict/difftype
+  Non-empty directory remains: /rmdir/extra
+  Non-empty directory remains: /rmdir/conflict
+  Modified mismatch: /difffiles/difftype/difftype/file (regular file vs fifo file)
+  Removed file changed: /difffiles/first/first/file
+  Modified link changed: /difflinks/difflinks/difflinks/link ("old" became "new")
+  Modified mismatch: /difflinks/difftype/difftype/link (symbolic link vs regular file)
+  Removed link changed: /difflinks/first/first/link ("old" became "new")
+  New link conflict: /difftype/difftype/difflinks/link ("new" vs "test")
+  Modified regular file changed: /difftype/difftype/difftype/one (fifo file became directory)
+  Modified symbolic link changed: /difftype/difftype/difftype/two (directory became regular file)
+  Remove mismatch: /difftype/first/first/fifo (fifo file became directory)
+  Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
+  Modified directory changed: /dirchange/fromdir/extradir (directory became symbolic link)
+  Modified regular file changed: /dirchange/todir/difffile (regular file became directory)
+  Modified fifo file changed: /dirchange/todir/difftype (regular file became directory)
+  New file mismatch: /adddir/conflict (directory vs regular file)
+  Directory mismatch: $TEST/adddir/conflict (regular file)
+  Directory mismatch: $TEST/dirchange/todir/difffile (regular file)
+  Directory mismatch: $TEST/dirchange/todir/difftype (fifo file)
+  New link conflict: /second/second/difflinks/link ("new link" vs "test link")
+  New file mismatch: /second/second/difftype/dir (directory vs fifo file)
+EOF
+
+echo "Differences for regular:"
+diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out \
+    || FAILED=yes
+
+## /first/difftype/second:
+present /first/difftype/second/fifo
+
+## /first/difflinks/second:
+link /first/difflinks/second/link "test link"
+
+## /first/difffiles/second:
+file /first/difffiles/second/file "bar"
+
+## /second/second/difftype:
+fifo /second/second/difftype/dir
+
+## /second/second/difflinks:
+link /second/second/difflinks/link "test link"
+
+## /second/second/difffiles:
+file /second/second/difffiles/file "test"
+conflict /second/second/difffiles/file 4f2ee8620a251fd53f06bb6112eb6ffa
+
+## /difftype/first/first:
+missing /difftype/first/first/fifo
+
+## /difftype/difftype/difftype:
+file /difftype/difftype/difftype/one "foo"
+link /difftype/difftype/difftype/two "bar"
+
+## /difftype/difftype/difflinks:
+link /difftype/difftype/difflinks/link "test"
+
+## /difftype/difftype/difffile:
+conflict /difftype/difftype/difffiles/file 117f2bcd1f6491f6044e79e5a57a9229
+
+## /difflinks/first/first:
+missing /difflinks/first/first/link
+
+## /difflinks/difftype/difftype:
+file /difflinks/difftype/difftype/link "test"
+
+## /difflinks/difflinks/difflinks:
+link /difflinks/difflinks/difflinks/link "test"
+
+## /difffiles/first/first:
+missing /difffiles/first/first/file
+
+## /difffiles/difftype/difftype:
+fifo /difffiles/difftype/difftype/file
+
+## /difffiles/difffiles/difffiles:
+file /difffiles/difffiles/difffiles/conflict "this is a test file"
+conflict /difffiles/difffiles/difffiles/conflict \
+    8261cfdd89280c4a6c26e4ac86541fe9
+
+## /adddir/conflict:
+file /adddir/conflict
+
+## /rmdir/extra:
+dir /rmdir/extra
+file /rmdir/extra/localfile.txt "foo"
+
+## /rmdir/conflict:
+dir /rmdir/conflict/difftype
+present /rmdir/conflict
+
+## /dirchange/fromdir/extradir:
+missing /dirchange/fromdir/extradir/file
+fifo /dirchange/fromdir/extradir/fifo
+
+## /dirchange/fromdir/conflict:
+file /dirchange/fromdir/conflict/somefile "bar"
+
+## /dirchange/todir/difffile:
+file /dirchange/todir/difffile "bar"
+
+## /dirchange/todir/difftype:
+fifo /dirchange/todir/difftype
+
+# Now test with -A '/first*' -A '/second* /*di*'.  This should remove
+# most of the warnings and conflicts.
+
+build_trees
+
+$COMMAND -r -A '/first*' -A '/second* /*di*' -d $WORKDIR -D $TEST > \
+    $WORKDIR/test1.out
+
+cat > $WORKDIR/correct1.out <<EOF
+  D /dirchange/fromdir/extradir/file
+  U /difffiles/difffiles/difffiles/conflict
+  U /difffiles/difftype/difftype/file
+  A /difffiles/first/first/file
+  U /difflinks/difflinks/difflinks/link
+  U /difflinks/difftype/difftype/link
+  A /difflinks/first/first/link
+  U /difftype/difftype/difffiles/file
+  U /difftype/difftype/difflinks/link
+  D /difftype/difftype/difftype/one
+  U /difftype/difftype/difftype/two
+  U /dirchange/todir/difffile
+  U /dirchange/todir/difftype
+  U /adddir/conflict
+  A /adddir/conflict/newfile
+  A /dirchange/todir/difffile/file
+  A /dirchange/todir/difftype/file
+  U /second/second/difffiles/file
+  U /second/second/difflinks/link
+  D /second/second/difftype/dir
+Warnings:
+  Modified regular file remains: /dirchange/fromdir/conflict/somefile
+  Modified regular file remains: /first/difffiles/second/file
+  Modified symbolic link remains: /first/difflinks/second/link
+  Modified directory remains: /first/difftype/second/fifo
+  Modified directory remains: /rmdir/conflict/difftype
+  Non-empty directory remains: /rmdir/extra
+  Non-empty directory remains: /rmdir/conflict
+  Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
+  Modified directory changed: /dirchange/fromdir/extradir (directory became symbolic link)
+EOF
+
+echo "Differences for -A '/first*' -A '/second* /*di*':"
+diff -u -L "correct" $WORKDIR/correct1.out -L "test" $WORKDIR/test1.out \
+    || FAILED=yes
+
+## /first/difftype/second:
+present /first/difftype/second/fifo
+
+## /first/difflinks/second:
+link /first/difflinks/second/link "test link"
+
+## /first/difffiles/second:
+file /first/difffiles/second/file "bar"
+
+## /second/second/difftype:
+missing /second/second/difftype/dir
+
+## /second/second/difflinks:
+link /second/second/difflinks/link "new link"
+
+## /second/second/difffiles:
+file /second/second/difffiles/file "new"
+noconflict /second/second/difffiles/file
+
+## /difftype/first/first:
+missing /difftype/first/first/fifo
+
+## /difftype/difftype/difftype:
+missing /difftype/difftype/difftype/one
+file /difftype/difftype/difftype/two "baz"
+
+## /difftype/difftype/difflinks:
+link /difftype/difftype/difflinks/link "new"
+
+## /difftype/difftype/difffile:
+noconflict /difftype/difftype/difffiles/file
+file /difftype/difftype/difffiles/file "foo"
+
+## /difflinks/first/first:
+link /difflinks/first/first/link "new"
+
+## /difflinks/difftype/difftype:
+link /difflinks/difftype/difftype/link "new"
+
+## /difflinks/difflinks/difflinks:
+link /difflinks/difflinks/difflinks/link "new"
+
+## /difffiles/first/first:
+file /difffiles/first/first/file "bar"
+
+## /difffiles/difftype/difftype:
+file /difffiles/difftype/difftype/file "new"
+
+## /difffiles/difffiles/difffiles:
+noconflict /difffiles/difffiles/difffiles/conflict
+file /difffiles/difffiles/difffiles/conflict "this is a new file"
+
+## /adddir/conflict:
+file /adddir/conflict/newfile
+
+## /rmdir/extra:
+dir /rmdir/extra
+file /rmdir/extra/localfile.txt "foo"
+
+## /rmdir/conflict:
+dir /rmdir/conflict/difftype
+present /rmdir/conflict
+
+## /dirchange/fromdir/extradir:
+missing /dirchange/fromdir/extradir/file
+fifo /dirchange/fromdir/extradir/fifo
+
+## /dirchange/fromdir/conflict:
+file /dirchange/fromdir/conflict/somefile "bar"
+
+## /dirchange/todir/difffile:
+file /dirchange/todir/difffile/file "baz"
+
+## /dirchange/todir/difftype:
+file /dirchange/todir/difftype/file "baz"
+
+[ "${FAILED}" = no ]

Copied: head/usr.sbin/etcupdate/tests/conflicts_test.sh (from r263221, head/tools/regression/usr.sbin/etcupdate/conflicts.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/etcupdate/tests/conflicts_test.sh	Sun Mar 16 04:09:22 2014	(r263226, copy of r263221, head/tools/regression/usr.sbin/etcupdate/conflicts.sh)
@@ -0,0 +1,294 @@
+#!/bin/sh
+#
+# Copyright (c) 2010 Advanced Computing Technologies LLC
+# Written by: John H. Baldwin <jhb at FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+# Various regression tests to run for the 'resolve' command.
+
+FAILED=no
+WORKDIR=work
+
+usage()
+{
+	echo "Usage: conflicts.sh [-s script] [-w workdir]"
+	exit 1
+}
+
+# Allow the user to specify an alternate work directory or script.
+COMMAND=etcupdate
+while getopts "s:w:" option; do
+	case $option in
+		s)
+			COMMAND="sh $OPTARG"
+			;;
+		w)
+			WORKDIR=$OPTARG
+			;;
+		*)
+			echo
+			usage
+			;;
+	esac
+done
+shift $((OPTIND - 1))
+if [ $# -ne 0 ]; then
+	usage
+fi
+
+CONFLICTS=$WORKDIR/conflicts
+OLD=$WORKDIR/old
+NEW=$WORKDIR/current
+TEST=$WORKDIR/test
+
+# These tests deal with conflicts to a single file.  For each test, we
+# generate a conflict in /etc/login.conf.  Each resolve option is tested
+# to ensure it DTRT.
+build_login_conflict()
+{
+
+	rm -rf $OLD $NEW $TEST $CONFLICTS
+	mkdir -p $OLD/etc $NEW/etc $TEST/etc
+	
+	# Generate a conflict in /etc/login.conf.
+	cat > $OLD/etc/login.conf <<EOF
+default:\\
+	:passwd_format=md5:
+EOF
+	cat > $NEW/etc/login.conf <<EOF
+default:\\
+	:passwd_format=md5:\\
+	:copyright=/etc/COPYRIGHT
+EOF
+	cat > $TEST/etc/login.conf <<EOF
+default:\\
+	:passwd_format=md5:\\
+        :welcome=/etc/motd:
+EOF
+
+	$COMMAND -r -d $WORKDIR -D $TEST >/dev/null
+}
+
+# This is used to verify special handling for /etc/mail/aliases and
+# the newaliases warning.
+build_aliases_conflict()
+{
+
+	rm -rf $OLD $NEW $TEST $CONFLICTS
+	mkdir -p $OLD/etc/mail $NEW/etc/mail $TEST/etc/mail
+
+	# Generate a conflict in /etc/mail/aliases
+	cat > $OLD/etc/mail/aliases <<EOF
+# root: me at my.domain
+
+# Basic system aliases -- these MUST be present
+MAILER-DAEMON: postmaster
+postmaster: root
+EOF
+	cat > $NEW/etc/mail/aliases <<EOF
+# root: me at my.domain
+
+# Basic system aliases -- these MUST be present
+MAILER-DAEMON: postmaster
+postmaster: root
+
+# General redirections for pseudo accounts
+_dhcp:  root
+_pflogd: root
+EOF
+	cat > $TEST/etc/mail/aliases <<EOF
+root: someone at example.com
+
+# Basic system aliases -- these MUST be present
+MAILER-DAEMON: postmaster
+postmaster: foo
+EOF
+
+	$COMMAND -r -d $WORKDIR -D $TEST >/dev/null
+}
+
+# $1 - relative path to file that should be missing from TEST
+missing()
+{
+	if [ -e $TEST/$1 -o -L $TEST/$1 ]; then
+		echo "File $1 should be missing"
+		FAILED=yes
+	fi
+}
+
+# $1 - relative path to file that should be present in TEST
+present()
+{
+	if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then
+		echo "File $1 should be present"
+		FAILED=yes
+	fi
+}
+
+# $1 - relative path to regular file that should be present in TEST
+# $2 - optional string that should match file contents
+# $3 - optional MD5 of the flie contents, overrides $2 if present
+file()
+{
+	local contents sum
+
+	if ! [ -f $TEST/$1 ]; then
+		echo "File $1 should be a regular file"
+		FAILED=yes
+	elif [ $# -eq 2 ]; then
+		contents=`cat $TEST/$1`
+		if [ "$contents" != "$2" ]; then
+			echo "File $1 has wrong contents"
+			FAILED=yes
+		fi
+	elif [ $# -eq 3 ]; then
+		sum=`md5 -q $TEST/$1`
+		if [ "$sum" != "$3" ]; then
+			echo "File $1 has wrong contents"
+			FAILED=yes
+		fi
+	fi
+}
+
+# $1 - relative path to a regular file that should have a conflict
+# $2 - optional MD5 of the conflict file contents
+conflict()
+{
+	local sum
+
+	if ! [ -f $CONFLICTS/$1 ]; then
+		echo "File $1 missing conflict"
+		FAILED=yes
+	elif [ $# -gt 1 ]; then
+		sum=`md5 -q $CONFLICTS/$1`
+		if [ "$sum" != "$2" ]; then
+			echo "Conflict $1 has wrong contents"
+			FAILED=yes
+		fi
+	fi
+}
+
+# $1 - relative path to a regular file that should no longer have a conflict

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-head mailing list