From d14afb2adcbf0db6625f582abf0c7154e4e005bd Mon Sep 17 00:00:00 2001 From: Julio Merino Date: Sun, 16 Mar 2014 04:09:22 +0000 Subject: [PATCH] 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. --- etc/mtree/BSD.tests.dist | 10 +++ tools/regression/usr.bin/Makefile | 3 - tools/regression/usr.bin/lastcomm/Makefile | 6 -- tools/regression/usr.bin/lastcomm/regress.t | 41 --------- tools/regression/usr.sbin/Makefile | 5 -- tools/regression/usr.sbin/newsyslog/Makefile | 4 - tools/regression/usr.sbin/newsyslog/regress.t | 6 -- tools/regression/usr.sbin/sa/Makefile | 6 -- tools/regression/usr.sbin/sa/regress.t | 81 ------------------ usr.bin/lastcomm/Makefile | 6 ++ usr.bin/lastcomm/tests/Makefile | 21 +++++ .../lastcomm/tests}/README | 0 usr.bin/lastcomm/tests/legacy_test.sh | 38 ++++++++ .../lastcomm/tests}/v1-amd64-acct.in | Bin .../lastcomm/tests}/v1-amd64.out | 0 .../lastcomm/tests}/v1-i386-acct.in | Bin .../lastcomm/tests}/v1-i386.out | 0 .../lastcomm/tests}/v1-sparc64-acct.in | Bin .../lastcomm/tests}/v1-sparc64.out | 0 .../lastcomm/tests}/v2-amd64-acct.in | Bin .../lastcomm/tests}/v2-amd64.out | 0 .../lastcomm/tests}/v2-i386-acct.in | Bin .../lastcomm/tests}/v2-i386.out | 0 .../lastcomm/tests}/v2-sparc64-acct.in | Bin .../lastcomm/tests}/v2-sparc64.out | 0 .../lastcomm/tests}/values.sh | 1 + usr.sbin/Makefile | 4 + usr.sbin/etcupdate/Makefile | 6 ++ usr.sbin/etcupdate/tests/Makefile | 17 ++++ .../etcupdate/tests/always_test.sh | 0 .../etcupdate/tests/conflicts_test.sh | 0 .../etcupdate/tests/fbsdid_test.sh | 0 .../etcupdate/tests/ignore_test.sh | 0 .../etcupdate/tests/preworld_test.sh | 0 .../etcupdate/tests/tests_test.sh | 0 .../etcupdate/tests/tzsetup_test.sh | 0 usr.sbin/newsyslog/Makefile | 6 ++ usr.sbin/newsyslog/tests/Makefile | 7 ++ .../newsyslog/tests/legacy_test.sh | 2 +- usr.sbin/sa/Makefile | 6 ++ usr.sbin/sa/tests/Makefile | 33 +++++++ usr.sbin/sa/tests/legacy_test.sh | 78 +++++++++++++++++ .../sa => usr.sbin/sa/tests}/prime.sh | 2 + .../sa => usr.sbin/sa/tests}/v1-amd64-sav.in | Bin .../sa => usr.sbin/sa/tests}/v1-amd64-sav.out | 0 .../sa => usr.sbin/sa/tests}/v1-amd64-u.out | 0 .../sa => usr.sbin/sa/tests}/v1-amd64-usr.in | Bin .../sa => usr.sbin/sa/tests}/v1-amd64-usr.out | 0 .../sa => usr.sbin/sa/tests}/v1-i386-sav.in | Bin .../sa => usr.sbin/sa/tests}/v1-i386-sav.out | 0 .../sa => usr.sbin/sa/tests}/v1-i386-u.out | 0 .../sa => usr.sbin/sa/tests}/v1-i386-usr.in | Bin .../sa => usr.sbin/sa/tests}/v1-i386-usr.out | 0 .../sa/tests}/v1-sparc64-sav.in | Bin .../sa/tests}/v1-sparc64-sav.out | 0 .../sa => usr.sbin/sa/tests}/v1-sparc64-u.out | 0 .../sa/tests}/v1-sparc64-usr.in | Bin .../sa/tests}/v1-sparc64-usr.out | 0 .../sa => usr.sbin/sa/tests}/v2-amd64-sav.in | Bin .../sa => usr.sbin/sa/tests}/v2-amd64-u.out | 0 .../sa => usr.sbin/sa/tests}/v2-amd64-usr.in | Bin .../sa => usr.sbin/sa/tests}/v2-i386-sav.in | Bin .../sa => usr.sbin/sa/tests}/v2-i386-u.out | 0 .../sa => usr.sbin/sa/tests}/v2-i386-usr.in | Bin .../sa/tests}/v2-sparc64-sav.in | Bin .../sa => usr.sbin/sa/tests}/v2-sparc64-u.out | 0 .../sa/tests}/v2-sparc64-usr.in | Bin usr.sbin/tests/Makefile | 10 +++ 68 files changed, 246 insertions(+), 153 deletions(-) delete mode 100644 tools/regression/usr.bin/lastcomm/Makefile delete mode 100755 tools/regression/usr.bin/lastcomm/regress.t delete mode 100644 tools/regression/usr.sbin/Makefile delete mode 100644 tools/regression/usr.sbin/newsyslog/Makefile delete mode 100755 tools/regression/usr.sbin/newsyslog/regress.t delete mode 100644 tools/regression/usr.sbin/sa/Makefile delete mode 100755 tools/regression/usr.sbin/sa/regress.t create mode 100644 usr.bin/lastcomm/tests/Makefile rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/README (100%) create mode 100644 usr.bin/lastcomm/tests/legacy_test.sh rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v1-amd64-acct.in (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v1-amd64.out (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v1-i386-acct.in (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v1-i386.out (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v1-sparc64-acct.in (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v1-sparc64.out (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v2-amd64-acct.in (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v2-amd64.out (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v2-i386-acct.in (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v2-i386.out (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v2-sparc64-acct.in (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/v2-sparc64.out (100%) rename {tools/regression/usr.bin/lastcomm => usr.bin/lastcomm/tests}/values.sh (98%) mode change 100644 => 100755 create mode 100644 usr.sbin/etcupdate/tests/Makefile rename tools/regression/usr.sbin/etcupdate/always.sh => usr.sbin/etcupdate/tests/always_test.sh (100%) mode change 100755 => 100644 rename tools/regression/usr.sbin/etcupdate/conflicts.sh => usr.sbin/etcupdate/tests/conflicts_test.sh (100%) mode change 100755 => 100644 rename tools/regression/usr.sbin/etcupdate/fbsdid.sh => usr.sbin/etcupdate/tests/fbsdid_test.sh (100%) mode change 100755 => 100644 rename tools/regression/usr.sbin/etcupdate/ignore.sh => usr.sbin/etcupdate/tests/ignore_test.sh (100%) mode change 100755 => 100644 rename tools/regression/usr.sbin/etcupdate/preworld.sh => usr.sbin/etcupdate/tests/preworld_test.sh (100%) mode change 100755 => 100644 rename tools/regression/usr.sbin/etcupdate/tests.sh => usr.sbin/etcupdate/tests/tests_test.sh (100%) mode change 100755 => 100644 rename tools/regression/usr.sbin/etcupdate/tzsetup.sh => usr.sbin/etcupdate/tests/tzsetup_test.sh (100%) mode change 100755 => 100644 create mode 100644 usr.sbin/newsyslog/tests/Makefile rename tools/regression/usr.sbin/newsyslog/regress.sh => usr.sbin/newsyslog/tests/legacy_test.sh (99%) mode change 100755 => 100644 create mode 100644 usr.sbin/sa/tests/Makefile create mode 100644 usr.sbin/sa/tests/legacy_test.sh rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/prime.sh (98%) mode change 100644 => 100755 rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-amd64-sav.in (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-amd64-sav.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-amd64-u.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-amd64-usr.in (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-amd64-usr.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-i386-sav.in (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-i386-sav.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-i386-u.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-i386-usr.in (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-i386-usr.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-sparc64-sav.in (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-sparc64-sav.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-sparc64-u.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-sparc64-usr.in (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v1-sparc64-usr.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v2-amd64-sav.in (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v2-amd64-u.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v2-amd64-usr.in (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v2-i386-sav.in (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v2-i386-u.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v2-i386-usr.in (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v2-sparc64-sav.in (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v2-sparc64-u.out (100%) rename {tools/regression/usr.sbin/sa => usr.sbin/sa/tests}/v2-sparc64-usr.in (100%) create mode 100644 usr.sbin/tests/Makefile diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index da64e3473cc..6bfbb9d8c74 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -95,6 +95,16 @@ atf-sh .. .. + lastcomm + .. + .. + usr.sbin + etcupdate + .. + newsyslog + .. + sa + .. .. .. .. diff --git a/tools/regression/usr.bin/Makefile b/tools/regression/usr.bin/Makefile index 7538f23a750..2365e3ab892 100644 --- a/tools/regression/usr.bin/Makefile +++ b/tools/regression/usr.bin/Makefile @@ -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 diff --git a/tools/regression/usr.bin/lastcomm/Makefile b/tools/regression/usr.bin/lastcomm/Makefile deleted file mode 100644 index 930f3ff5fd2..00000000000 --- a/tools/regression/usr.bin/lastcomm/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -all: regress - -regress: regress.t - ./regress.t diff --git a/tools/regression/usr.bin/lastcomm/regress.t b/tools/regression/usr.bin/lastcomm/regress.t deleted file mode 100755 index d733dbcdb45..00000000000 --- a/tools/regression/usr.bin/lastcomm/regress.t +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -DIR=`dirname $0` -ARCH=`uname -m` - -TZ=UTC; export TZ - -check() -{ - NUM=$1 - shift - # Remove tty field, which varies between systems. - awk '{$4 = ""; print}' | - if diff -q - $DIR/$1 - then - echo "ok $NUM" - else - echo "not ok $NUM" - fi -} - - -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 - -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 - -exit 0 diff --git a/tools/regression/usr.sbin/Makefile b/tools/regression/usr.sbin/Makefile deleted file mode 100644 index 071100b226b..00000000000 --- a/tools/regression/usr.sbin/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -SUBDIR= newsyslog sa - -.include diff --git a/tools/regression/usr.sbin/newsyslog/Makefile b/tools/regression/usr.sbin/newsyslog/Makefile deleted file mode 100644 index 2c9ca594350..00000000000 --- a/tools/regression/usr.sbin/newsyslog/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD$ - -all: - sh regress.sh diff --git a/tools/regression/usr.sbin/newsyslog/regress.t b/tools/regression/usr.sbin/newsyslog/regress.t deleted file mode 100755 index c36d8342d32..00000000000 --- a/tools/regression/usr.sbin/newsyslog/regress.t +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -cd `dirname $0` - -sh regress.sh diff --git a/tools/regression/usr.sbin/sa/Makefile b/tools/regression/usr.sbin/sa/Makefile deleted file mode 100644 index 930f3ff5fd2..00000000000 --- a/tools/regression/usr.sbin/sa/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -all: regress - -regress: regress.t - ./regress.t diff --git a/tools/regression/usr.sbin/sa/regress.t b/tools/regression/usr.sbin/sa/regress.t deleted file mode 100755 index d28536adddd..00000000000 --- a/tools/regression/usr.sbin/sa/regress.t +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -DIR=`dirname $0` -LCDIR=`dirname $0`/../../usr.bin/lastcomm -ARCH=`uname -m` - -collapse_whitespace() -{ - sed -E 's,[ ]+, ,g' -} - -check() -{ - NUM=$1 - shift - collapse_whitespace | \ - if diff -q - $1 - then - echo "ok $NUM" - else - echo "not ok $NUM" - fi -} - -cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in -cp $LCDIR/v2-$ARCH-acct.in $DIR/v2-$ARCH-acct.in - -echo 1..13 - -# Command listings of the two acct versions -sa -u $DIR/v1-$ARCH-acct.in | check 1 $DIR/v1-$ARCH-u.out -sa -u $DIR/v2-$ARCH-acct.in | check 2 $DIR/v2-$ARCH-u.out - -# Plain summaries of user/process -sa -i $DIR/v1-$ARCH-acct.in | check 3 $DIR/v1-$ARCH-sav.out -sa -im $DIR/v1-$ARCH-acct.in | check 4 $DIR/v1-$ARCH-usr.out - -# Backward compatibility of v1 summary files -sa -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null | - check 5 $DIR/v1-$ARCH-sav.out -sa -m -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null | - check 6 $DIR/v1-$ARCH-usr.out - -# Convert old summary format to new -cp $DIR/v1-$ARCH-sav.in $DIR/v2c-$ARCH-sav.in -cp $DIR/v1-$ARCH-usr.in $DIR/v2c-$ARCH-usr.in -sa -s -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null >/dev/null -sa -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null | - check 7 $DIR/v1-$ARCH-sav.out -sa -m -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null | - check 8 $DIR/v1-$ARCH-usr.out - -# Reading v2 summary files -sa -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null | - check 9 $DIR/v1-$ARCH-sav.out -sa -m -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null | - check 10 $DIR/v1-$ARCH-usr.out - -# Summarize -sa -is -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in >/dev/null -sa -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null | - check 11 $DIR/v1-$ARCH-sav.out -sa -m -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null | - check 12 $DIR/v1-$ARCH-usr.out - -# Accumulate -cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in -sa -is -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in >/dev/null -cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in -sa -s -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in \ - | collapse_whitespace >$DIR/double -cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in -sa -i $DIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in | check 13 $DIR/double - -# Clean up -rm $DIR/double $DIR/v2c-$ARCH-usr.in $DIR/v2c-$ARCH-sav.in $DIR/v1-$ARCH-acct.in $DIR/v2-$ARCH-acct.in - -exit 0 diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile index 84708d9fb41..88253757b7f 100644 --- a/usr.bin/lastcomm/Makefile +++ b/usr.bin/lastcomm/Makefile @@ -1,7 +1,13 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include + PROG= lastcomm SRCS= lastcomm.c readrec.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/usr.bin/lastcomm/tests/Makefile b/usr.bin/lastcomm/tests/Makefile new file mode 100644 index 00000000000..b0fac0e4aa1 --- /dev/null +++ b/usr.bin/lastcomm/tests/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.bin/lastcomm + +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 diff --git a/tools/regression/usr.bin/lastcomm/README b/usr.bin/lastcomm/tests/README similarity index 100% rename from tools/regression/usr.bin/lastcomm/README rename to usr.bin/lastcomm/tests/README diff --git a/usr.bin/lastcomm/tests/legacy_test.sh b/usr.bin/lastcomm/tests/legacy_test.sh new file mode 100644 index 00000000000..35ef78bf848 --- /dev/null +++ b/usr.bin/lastcomm/tests/legacy_test.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +DIR=`dirname $0` +ARCH=`uname -m` + +TZ=UTC; export TZ + +check() +{ + NUM=$1 + shift + # Remove tty field, which varies between systems. + awk '{$4 = ""; print}' | + if diff -q - $1 + then + echo "ok $NUM" + else + echo "not ok $NUM" + fi +} + + +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 $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 - + SCRIPTS=etcupdate.sh MAN= etcupdate.8 +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/usr.sbin/etcupdate/tests/Makefile b/usr.sbin/etcupdate/tests/Makefile new file mode 100644 index 00000000000..da83397e61f --- /dev/null +++ b/usr.sbin/etcupdate/tests/Makefile @@ -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 diff --git a/tools/regression/usr.sbin/etcupdate/always.sh b/usr.sbin/etcupdate/tests/always_test.sh old mode 100755 new mode 100644 similarity index 100% rename from tools/regression/usr.sbin/etcupdate/always.sh rename to usr.sbin/etcupdate/tests/always_test.sh diff --git a/tools/regression/usr.sbin/etcupdate/conflicts.sh b/usr.sbin/etcupdate/tests/conflicts_test.sh old mode 100755 new mode 100644 similarity index 100% rename from tools/regression/usr.sbin/etcupdate/conflicts.sh rename to usr.sbin/etcupdate/tests/conflicts_test.sh diff --git a/tools/regression/usr.sbin/etcupdate/fbsdid.sh b/usr.sbin/etcupdate/tests/fbsdid_test.sh old mode 100755 new mode 100644 similarity index 100% rename from tools/regression/usr.sbin/etcupdate/fbsdid.sh rename to usr.sbin/etcupdate/tests/fbsdid_test.sh diff --git a/tools/regression/usr.sbin/etcupdate/ignore.sh b/usr.sbin/etcupdate/tests/ignore_test.sh old mode 100755 new mode 100644 similarity index 100% rename from tools/regression/usr.sbin/etcupdate/ignore.sh rename to usr.sbin/etcupdate/tests/ignore_test.sh diff --git a/tools/regression/usr.sbin/etcupdate/preworld.sh b/usr.sbin/etcupdate/tests/preworld_test.sh old mode 100755 new mode 100644 similarity index 100% rename from tools/regression/usr.sbin/etcupdate/preworld.sh rename to usr.sbin/etcupdate/tests/preworld_test.sh diff --git a/tools/regression/usr.sbin/etcupdate/tests.sh b/usr.sbin/etcupdate/tests/tests_test.sh old mode 100755 new mode 100644 similarity index 100% rename from tools/regression/usr.sbin/etcupdate/tests.sh rename to usr.sbin/etcupdate/tests/tests_test.sh diff --git a/tools/regression/usr.sbin/etcupdate/tzsetup.sh b/usr.sbin/etcupdate/tests/tzsetup_test.sh old mode 100755 new mode 100644 similarity index 100% rename from tools/regression/usr.sbin/etcupdate/tzsetup.sh rename to usr.sbin/etcupdate/tests/tzsetup_test.sh diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile index ebc297b4cf2..4e3ae557034 100644 --- a/usr.sbin/newsyslog/Makefile +++ b/usr.sbin/newsyslog/Makefile @@ -1,7 +1,13 @@ # $FreeBSD$ +.include + PROG= newsyslog MAN= newsyslog.8 newsyslog.conf.5 SRCS= newsyslog.c ptimes.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/usr.sbin/newsyslog/tests/Makefile b/usr.sbin/newsyslog/tests/Makefile new file mode 100644 index 00000000000..f8ad2739cd7 --- /dev/null +++ b/usr.sbin/newsyslog/tests/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.sbin/newsyslog + +TAP_TESTS_SH= legacy_test + +.include diff --git a/tools/regression/usr.sbin/newsyslog/regress.sh b/usr.sbin/newsyslog/tests/legacy_test.sh old mode 100755 new mode 100644 similarity index 99% rename from tools/regression/usr.sbin/newsyslog/regress.sh rename to usr.sbin/newsyslog/tests/legacy_test.sh index 70c424016c9..ba10f2c5611 --- a/tools/regression/usr.sbin/newsyslog/regress.sh +++ b/usr.sbin/newsyslog/tests/legacy_test.sh @@ -3,7 +3,7 @@ # $FreeBSD$ COUNT=0 -TMPDIR=`mktemp -d -t regress_newsyslog` +TMPDIR=$(pwd)/work if [ $? -ne 0 ]; then echo "$0: Can't create temp dir, exiting..." exit 1 diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile index 0adf1f85e1f..23f9bf274a8 100644 --- a/usr.sbin/sa/Makefile +++ b/usr.sbin/sa/Makefile @@ -1,9 +1,15 @@ # $FreeBSD$ +.include + .PATH: ${.CURDIR}/../../usr.bin/lastcomm PROG= sa MAN= sa.8 SRCS= main.c db.c pdb.c usrdb.c readrec.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/usr.sbin/sa/tests/Makefile b/usr.sbin/sa/tests/Makefile new file mode 100644 index 00000000000..204b5109451 --- /dev/null +++ b/usr.sbin/sa/tests/Makefile @@ -0,0 +1,33 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.sbin/sa + +TAP_TESTS_SH= legacy_test + +FILESDIR= ${TESTSDIR} +FILES= v1-amd64-sav.in +FILES+= v1-amd64-sav.out +FILES+= v1-amd64-u.out +FILES+= v1-amd64-usr.in +FILES+= v1-amd64-usr.out +FILES+= v1-i386-sav.in +FILES+= v1-i386-sav.out +FILES+= v1-i386-u.out +FILES+= v1-i386-usr.in +FILES+= v1-i386-usr.out +FILES+= v1-sparc64-sav.in +FILES+= v1-sparc64-sav.out +FILES+= v1-sparc64-u.out +FILES+= v1-sparc64-usr.in +FILES+= v1-sparc64-usr.out +FILES+= v2-amd64-sav.in +FILES+= v2-amd64-u.out +FILES+= v2-amd64-usr.in +FILES+= v2-i386-sav.in +FILES+= v2-i386-u.out +FILES+= v2-i386-usr.in +FILES+= v2-sparc64-sav.in +FILES+= v2-sparc64-u.out +FILES+= v2-sparc64-usr.in + +.include diff --git a/usr.sbin/sa/tests/legacy_test.sh b/usr.sbin/sa/tests/legacy_test.sh new file mode 100644 index 00000000000..d0d8f429366 --- /dev/null +++ b/usr.sbin/sa/tests/legacy_test.sh @@ -0,0 +1,78 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +DIR=`dirname $0` +LCDIR=`dirname $0`/../../usr.bin/lastcomm +ARCH=`uname -m` + +collapse_whitespace() +{ + sed -E 's,[ ]+, ,g' +} + +check() +{ + NUM=$1 + shift + collapse_whitespace | \ + if diff -q - $1 + then + echo "ok $NUM" + else + echo "not ok $NUM" + fi +} + +install -c -m 644 $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in +install -c -m 644 $LCDIR/v2-$ARCH-acct.in v2-$ARCH-acct.in + +echo 1..13 + +# Command listings of the two acct versions +sa -u v1-$ARCH-acct.in | check 1 $DIR/v1-$ARCH-u.out +sa -u v2-$ARCH-acct.in | check 2 $DIR/v2-$ARCH-u.out + +# Plain summaries of user/process +sa -i v1-$ARCH-acct.in | check 3 $DIR/v1-$ARCH-sav.out +sa -im v1-$ARCH-acct.in | check 4 $DIR/v1-$ARCH-usr.out + +# Backward compatibility of v1 summary files +sa -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null | + check 5 $DIR/v1-$ARCH-sav.out +sa -m -P $DIR/v1-$ARCH-sav.in -U $DIR/v1-$ARCH-usr.in /dev/null | + check 6 $DIR/v1-$ARCH-usr.out + +# Convert old summary format to new +install -c -m 644 $DIR/v1-$ARCH-sav.in v2c-$ARCH-sav.in +install -c -m 644 $DIR/v1-$ARCH-usr.in v2c-$ARCH-usr.in +sa -s -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null >/dev/null +sa -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null | + check 7 $DIR/v1-$ARCH-sav.out +sa -m -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null | + check 8 $DIR/v1-$ARCH-usr.out + +# Reading v2 summary files +sa -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null | + check 9 $DIR/v1-$ARCH-sav.out +sa -m -P $DIR/v2-$ARCH-sav.in -U $DIR/v2-$ARCH-usr.in /dev/null | + check 10 $DIR/v1-$ARCH-usr.out + +# Summarize +sa -is -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in v1-$ARCH-acct.in >/dev/null +sa -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null | + check 11 $DIR/v1-$ARCH-sav.out +sa -m -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in /dev/null | + check 12 $DIR/v1-$ARCH-usr.out + +# Accumulate +install -c -m 644 $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in +sa -is -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in v1-$ARCH-acct.in >/dev/null +install -c -m 644 $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in +sa -s -P v2c-$ARCH-sav.in -U v2c-$ARCH-usr.in v1-$ARCH-acct.in \ + | collapse_whitespace >double +cp $LCDIR/v1-$ARCH-acct.in v1-$ARCH-acct.in +sa -i v1-$ARCH-acct.in v1-$ARCH-acct.in | check 13 double + +exit 0 diff --git a/tools/regression/usr.sbin/sa/prime.sh b/usr.sbin/sa/tests/prime.sh old mode 100644 new mode 100755 similarity index 98% rename from tools/regression/usr.sbin/sa/prime.sh rename to usr.sbin/sa/tests/prime.sh index c3fec3275a4..6992f45bce2 --- a/tools/regression/usr.sbin/sa/prime.sh +++ b/usr.sbin/sa/tests/prime.sh @@ -6,6 +6,8 @@ # $FreeBSD$ # +TZ=UTC; export TZ + # Set this to the path of the current sa command SANEW=/usr/sbin/sa diff --git a/tools/regression/usr.sbin/sa/v1-amd64-sav.in b/usr.sbin/sa/tests/v1-amd64-sav.in similarity index 100% rename from tools/regression/usr.sbin/sa/v1-amd64-sav.in rename to usr.sbin/sa/tests/v1-amd64-sav.in diff --git a/tools/regression/usr.sbin/sa/v1-amd64-sav.out b/usr.sbin/sa/tests/v1-amd64-sav.out similarity index 100% rename from tools/regression/usr.sbin/sa/v1-amd64-sav.out rename to usr.sbin/sa/tests/v1-amd64-sav.out diff --git a/tools/regression/usr.sbin/sa/v1-amd64-u.out b/usr.sbin/sa/tests/v1-amd64-u.out similarity index 100% rename from tools/regression/usr.sbin/sa/v1-amd64-u.out rename to usr.sbin/sa/tests/v1-amd64-u.out diff --git a/tools/regression/usr.sbin/sa/v1-amd64-usr.in b/usr.sbin/sa/tests/v1-amd64-usr.in similarity index 100% rename from tools/regression/usr.sbin/sa/v1-amd64-usr.in rename to usr.sbin/sa/tests/v1-amd64-usr.in diff --git a/tools/regression/usr.sbin/sa/v1-amd64-usr.out b/usr.sbin/sa/tests/v1-amd64-usr.out similarity index 100% rename from tools/regression/usr.sbin/sa/v1-amd64-usr.out rename to usr.sbin/sa/tests/v1-amd64-usr.out diff --git a/tools/regression/usr.sbin/sa/v1-i386-sav.in b/usr.sbin/sa/tests/v1-i386-sav.in similarity index 100% rename from tools/regression/usr.sbin/sa/v1-i386-sav.in rename to usr.sbin/sa/tests/v1-i386-sav.in diff --git a/tools/regression/usr.sbin/sa/v1-i386-sav.out b/usr.sbin/sa/tests/v1-i386-sav.out similarity index 100% rename from tools/regression/usr.sbin/sa/v1-i386-sav.out rename to usr.sbin/sa/tests/v1-i386-sav.out diff --git a/tools/regression/usr.sbin/sa/v1-i386-u.out b/usr.sbin/sa/tests/v1-i386-u.out similarity index 100% rename from tools/regression/usr.sbin/sa/v1-i386-u.out rename to usr.sbin/sa/tests/v1-i386-u.out diff --git a/tools/regression/usr.sbin/sa/v1-i386-usr.in b/usr.sbin/sa/tests/v1-i386-usr.in similarity index 100% rename from tools/regression/usr.sbin/sa/v1-i386-usr.in rename to usr.sbin/sa/tests/v1-i386-usr.in diff --git a/tools/regression/usr.sbin/sa/v1-i386-usr.out b/usr.sbin/sa/tests/v1-i386-usr.out similarity index 100% rename from tools/regression/usr.sbin/sa/v1-i386-usr.out rename to usr.sbin/sa/tests/v1-i386-usr.out diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-sav.in b/usr.sbin/sa/tests/v1-sparc64-sav.in similarity index 100% rename from tools/regression/usr.sbin/sa/v1-sparc64-sav.in rename to usr.sbin/sa/tests/v1-sparc64-sav.in diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-sav.out b/usr.sbin/sa/tests/v1-sparc64-sav.out similarity index 100% rename from tools/regression/usr.sbin/sa/v1-sparc64-sav.out rename to usr.sbin/sa/tests/v1-sparc64-sav.out diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-u.out b/usr.sbin/sa/tests/v1-sparc64-u.out similarity index 100% rename from tools/regression/usr.sbin/sa/v1-sparc64-u.out rename to usr.sbin/sa/tests/v1-sparc64-u.out diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-usr.in b/usr.sbin/sa/tests/v1-sparc64-usr.in similarity index 100% rename from tools/regression/usr.sbin/sa/v1-sparc64-usr.in rename to usr.sbin/sa/tests/v1-sparc64-usr.in diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-usr.out b/usr.sbin/sa/tests/v1-sparc64-usr.out similarity index 100% rename from tools/regression/usr.sbin/sa/v1-sparc64-usr.out rename to usr.sbin/sa/tests/v1-sparc64-usr.out diff --git a/tools/regression/usr.sbin/sa/v2-amd64-sav.in b/usr.sbin/sa/tests/v2-amd64-sav.in similarity index 100% rename from tools/regression/usr.sbin/sa/v2-amd64-sav.in rename to usr.sbin/sa/tests/v2-amd64-sav.in diff --git a/tools/regression/usr.sbin/sa/v2-amd64-u.out b/usr.sbin/sa/tests/v2-amd64-u.out similarity index 100% rename from tools/regression/usr.sbin/sa/v2-amd64-u.out rename to usr.sbin/sa/tests/v2-amd64-u.out diff --git a/tools/regression/usr.sbin/sa/v2-amd64-usr.in b/usr.sbin/sa/tests/v2-amd64-usr.in similarity index 100% rename from tools/regression/usr.sbin/sa/v2-amd64-usr.in rename to usr.sbin/sa/tests/v2-amd64-usr.in diff --git a/tools/regression/usr.sbin/sa/v2-i386-sav.in b/usr.sbin/sa/tests/v2-i386-sav.in similarity index 100% rename from tools/regression/usr.sbin/sa/v2-i386-sav.in rename to usr.sbin/sa/tests/v2-i386-sav.in diff --git a/tools/regression/usr.sbin/sa/v2-i386-u.out b/usr.sbin/sa/tests/v2-i386-u.out similarity index 100% rename from tools/regression/usr.sbin/sa/v2-i386-u.out rename to usr.sbin/sa/tests/v2-i386-u.out diff --git a/tools/regression/usr.sbin/sa/v2-i386-usr.in b/usr.sbin/sa/tests/v2-i386-usr.in similarity index 100% rename from tools/regression/usr.sbin/sa/v2-i386-usr.in rename to usr.sbin/sa/tests/v2-i386-usr.in diff --git a/tools/regression/usr.sbin/sa/v2-sparc64-sav.in b/usr.sbin/sa/tests/v2-sparc64-sav.in similarity index 100% rename from tools/regression/usr.sbin/sa/v2-sparc64-sav.in rename to usr.sbin/sa/tests/v2-sparc64-sav.in diff --git a/tools/regression/usr.sbin/sa/v2-sparc64-u.out b/usr.sbin/sa/tests/v2-sparc64-u.out similarity index 100% rename from tools/regression/usr.sbin/sa/v2-sparc64-u.out rename to usr.sbin/sa/tests/v2-sparc64-u.out diff --git a/tools/regression/usr.sbin/sa/v2-sparc64-usr.in b/usr.sbin/sa/tests/v2-sparc64-usr.in similarity index 100% rename from tools/regression/usr.sbin/sa/v2-sparc64-usr.in rename to usr.sbin/sa/tests/v2-sparc64-usr.in diff --git a/usr.sbin/tests/Makefile b/usr.sbin/tests/Makefile new file mode 100644 index 00000000000..a7e9c7140f7 --- /dev/null +++ b/usr.sbin/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/usr.sbin + +.PATH: ${.CURDIR:H:H}/tests +KYUAFILE= yes + +.include