diff options
author | jhb <jhb@FreeBSD.org> | 2013-12-09 19:31:30 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2013-12-09 19:31:30 +0000 |
commit | 4d0370b2ea8b272957152009285cb046543d0f82 (patch) | |
tree | e2fe4b8fff3506129db93a9eda53d3561511ee18 /tools/regression | |
parent | a5fb9c53410951ccdd7f40ec06e6aacf05e777dd (diff) | |
download | FreeBSD-src-4d0370b2ea8b272957152009285cb046543d0f82.zip FreeBSD-src-4d0370b2ea8b272957152009285cb046543d0f82.tar.gz |
- Refresh /etc/localtime after each update using tzsetup -r.
- Regenerate /var/db/services.db when /etc/services changes.
MFC after: 1 week
Diffstat (limited to 'tools/regression')
-rwxr-xr-x | tools/regression/usr.sbin/etcupdate/preworld.sh | 3 | ||||
-rwxr-xr-x | tools/regression/usr.sbin/etcupdate/tests.sh | 21 | ||||
-rwxr-xr-x | tools/regression/usr.sbin/etcupdate/tzsetup.sh | 221 |
3 files changed, 244 insertions, 1 deletions
diff --git a/tools/regression/usr.sbin/etcupdate/preworld.sh b/tools/regression/usr.sbin/etcupdate/preworld.sh index b514c05..ccd7b75 100755 --- a/tools/regression/usr.sbin/etcupdate/preworld.sh +++ b/tools/regression/usr.sbin/etcupdate/preworld.sh @@ -66,7 +66,7 @@ TEST=$WORKDIR/test build_trees() { - # Populate trees with pre-world files and an additional file + # Populate trees with pre-world files and additional files # that should not be touched. rm -rf $SRC $OLD $TEST $CONFLICTS @@ -126,6 +126,7 @@ polkit:*:562: haldaemon:*:560: EOF rm $TEST/etc/inetd.conf + touch $TEST/etc/localtime # Copy the "old" source tree to the new source tree and # make upstream modifications. diff --git a/tools/regression/usr.sbin/etcupdate/tests.sh b/tools/regression/usr.sbin/etcupdate/tests.sh index 8edabb3..22b3d0b 100755 --- a/tools/regression/usr.sbin/etcupdate/tests.sh +++ b/tools/regression/usr.sbin/etcupdate/tests.sh @@ -628,6 +628,24 @@ root: someone@example.com MAILER-DAEMON: postmaster postmaster: root EOF + + # - Verify that updating an unmodified /etc/services builds + # /var/db/services.db. + cat > $OLD/etc/services <<EOF +rtmp 1/ddp #Routing Table Maintenance Protocol +tcpmux 1/tcp #TCP Port Service Multiplexer +tcpmux 1/udp #TCP Port Service Multiplexer +EOF + cat > $NEW/etc/services <<EOF +rtmp 1/ddp #Routing Table Maintenance Protocol +tcpmux 1/tcp #TCP Port Service Multiplexer +tcpmux 1/udp #TCP Port Service Multiplexer +nbp 2/ddp #Name Binding Protocol +compressnet 2/tcp #Management Utility +compressnet 2/udp #Management Utility +EOF + cp $OLD/etc/services $TEST/etc/services + mkdir -p $TEST/var/db } # $1 - relative path to file that should be missing from TEST @@ -896,6 +914,8 @@ check_trees() file /etc/login.conf "" 7774a0f9a3a372c7c109c32fd31c4b6b file /etc/login.conf.db file /etc/mail/aliases "" 7d598f89ec040ab56af54011bdb83337 + file /etc/services "" 37fb6a8d1273f3b78329d431f21d9c7d + file /var/db/services.db } if [ `id -u` -ne 0 ]; then @@ -934,6 +954,7 @@ cat > $WORKDIR/correct.out <<EOF U /dirchange/old/todir U /etc/login.conf M /etc/mail/aliases + U /etc/services A /adddir/partial/file A /dirchange/old/todir/file A /etc/master.passwd diff --git a/tools/regression/usr.sbin/etcupdate/tzsetup.sh b/tools/regression/usr.sbin/etcupdate/tzsetup.sh new file mode 100755 index 0000000..20107f4 --- /dev/null +++ b/tools/regression/usr.sbin/etcupdate/tzsetup.sh @@ -0,0 +1,221 @@ +#!/bin/sh +# +# Copyright (c) 2013 Advanced Computing Technologies LLC +# Written by: John H. Baldwin <jhb@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 for the tzsetup handling in the 'update' command. + +WORKDIR=work + +usage() +{ + echo "Usage: tzsetup.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 + +build_trees() +{ + + # Build the base tree, but not /etc/localtime itself + local i j k + + rm -rf $OLD $NEW $TEST $CONFLICTS + mkdir -p $OLD $NEW $TEST + mkdir -p $TEST/etc + mkdir -p $TEST/var/db + mkdir -p $TEST/usr/share/zoneinfo + + # Create a dummy timezone file + echo "foo" > $TEST/usr/share/zoneinfo/foo + +} + +# $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" + 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" + elif [ $# -gt 1 ]; then + val=`readlink $TEST/$1` + if [ "$val" != "$2" ]; then + echo "Link $1 should link to \"$2\"" + 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" + elif [ $# -eq 2 ]; then + contents=`cat $TEST/$1` + if [ "$contents" != "$2" ]; then + echo "File $1 has wrong contents" + fi + elif [ $# -eq 3 ]; then + sum=`md5 -q $TEST/$1` + if [ "$sum" != "$3" ]; then + echo "File $1 has wrong contents" + fi + fi +} + +if [ `id -u` -ne 0 ]; then + echo "must be root" +fi + +if [ -r /etc/etcupdate.conf ]; then + echo "WARNING: /etc/etcupdate.conf settings may break some tests." +fi + +# First, test for /etc/localtime not existing + +build_trees + +$COMMAND -nr -d $WORKDIR -D $TEST > $WORKDIR/testn.out + +cat > $WORKDIR/correct.out <<EOF +EOF + +echo "Differences for no /etc/localtime with -n:" +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out + +$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out + +echo "Differences for no /etc/localtime:" +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out + +missing /etc/localtime +missing /var/db/zoneinfo + +# Second, test for /etc/localtime being a symlink + +build_trees +ln -s /dev/null $TEST/etc/localtime + +$COMMAND -nr -d $WORKDIR -D $TEST > $WORKDIR/testn.out + +cat > $WORKDIR/correct.out <<EOF +EOF + +echo "Differences for symlinked /etc/localtime with -n:" +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out + +$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out + +echo "Differences for symlinked /etc/localtime:" +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out + +link /etc/localtime "/dev/null" +missing /var/db/zoneinfo + +# Third, test for /etc/localtime as a file and a missing /var/db/zoneinfo + +build_trees +echo "bar" > $TEST/etc/localtime + +$COMMAND -nr -d $WORKDIR -D $TEST > $WORKDIR/testn.out + +cat > $WORKDIR/correct.out <<EOF +Warnings: + Needs update: /etc/localtime (required manual update via tzsetup(1)) +EOF + +echo "Differences for missing /var/db/zoneinfo with -n:" +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out + +$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out + +echo "Differences for missing /var/db/zoneinfo:" +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out + +file /etc/localtime "bar" +missing /var/db/zoneinfo + +# Finally, test the case where it should update /etc/localtime + +build_trees +echo "bar" > $TEST/etc/localtime +echo "foo" > $TEST/var/db/zoneinfo + +$COMMAND -nr -d $WORKDIR -D $TEST > $WORKDIR/testn.out + +cat > $WORKDIR/correct.out <<EOF +EOF + +echo "Differences for real update with -n:" +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out + +$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out + +echo "Differences for real update:" +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out + +file /etc/localtime "foo" +file /var/db/zoneinfo "foo" |