Index: head/tools/regression/usr.sbin/sa/regress.t =================================================================== --- head/tools/regression/usr.sbin/sa/regress.t (revision 263082) +++ head/tools/regression/usr.sbin/sa/regress.t (revision 263083) @@ -1,74 +1,81 @@ #!/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 >$DIR/double +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 Index: head/tools/regression/usr.sbin/sa/v1-amd64-sav.out =================================================================== --- head/tools/regression/usr.sbin/sa/v1-amd64-sav.out (revision 263082) +++ head/tools/regression/usr.sbin/sa/v1-amd64-sav.out (revision 263083) @@ -1,5 +1,5 @@ - 28 0.282re 0.06cp 40avio 957k - 13 0.141re 0.06cp 87avio 903k ***other - 3 0.000re 0.00cp 0avio 0k ln - 9 0.141re 0.00cp 0avio 19700k time - 3 0.000re 0.00cp 0avio 0k time* + 28 0.282re 0.06cp 40avio 957k + 13 0.141re 0.06cp 87avio 903k ***other + 3 0.000re 0.00cp 0avio 0k ln + 9 0.141re 0.00cp 0avio 19700k time + 3 0.000re 0.00cp 0avio 0k time* Index: head/tools/regression/usr.sbin/sa/v1-amd64-u.out =================================================================== --- head/tools/regression/usr.sbin/sa/v1-amd64-u.out (revision 263082) +++ head/tools/regression/usr.sbin/sa/v1-amd64-u.out (revision 263083) @@ -1,28 +1,28 @@ - 0 0.000 cpu 0k mem 0 io accton - 0 0.172 cpu 41k mem 0 io awk - 0 0.000 cpu 140k mem 0 io time - 0 3.031 cpu 45k mem 1 io egrep - 0 0.000 cpu 0k mem 0 io time - 0 0.250 cpu 42k mem 1087 io find - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io sleep - 0 0.000 cpu 57k mem 0 io time - 0 0.016 cpu 31k mem 16 io dd - 0 0.000 cpu 0k mem 0 io time - 0 0.203 cpu 1976k mem 0 io diff - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io time* - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io time* - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io time* - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 713k mem 0 io cc1 - 0 0.000 cpu 0k mem 0 io as - 0 0.000 cpu 228k mem 1 io ld - 0 0.000 cpu 196k mem 9 io cc - 0 0.000 cpu 45k mem 7 io core - 0 0.000 cpu 0k mem 9 io core* + 0 0.000 cpu 0k mem 0 io accton + 0 0.172 cpu 41k mem 0 io awk + 0 0.000 cpu 140k mem 0 io time + 0 3.031 cpu 45k mem 1 io egrep + 0 0.000 cpu 0k mem 0 io time + 0 0.250 cpu 42k mem 1087 io find + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io sleep + 0 0.000 cpu 57k mem 0 io time + 0 0.016 cpu 31k mem 16 io dd + 0 0.000 cpu 0k mem 0 io time + 0 0.203 cpu 1976k mem 0 io diff + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io time* + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io time* + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io time* + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 713k mem 0 io cc1 + 0 0.000 cpu 0k mem 0 io as + 0 0.000 cpu 228k mem 1 io ld + 0 0.000 cpu 196k mem 9 io cc + 0 0.000 cpu 45k mem 7 io core + 0 0.000 cpu 0k mem 9 io core* Index: head/tools/regression/usr.sbin/sa/v1-amd64-usr.out =================================================================== --- head/tools/regression/usr.sbin/sa/v1-amd64-usr.out (revision 263082) +++ head/tools/regression/usr.sbin/sa/v1-amd64-usr.out (revision 263083) @@ -1 +1 @@ -root 28 0.06cpu 1130tio 3514k*sec +root 28 0.06cpu 1130tio 3514k*sec Index: head/tools/regression/usr.sbin/sa/v1-i386-sav.out =================================================================== --- head/tools/regression/usr.sbin/sa/v1-i386-sav.out (revision 263082) +++ head/tools/regression/usr.sbin/sa/v1-i386-sav.out (revision 263083) @@ -1,5 +1,5 @@ - 28 0.425re 0.10cp 143avio 477k - 14 0.220re 0.10cp 286avio 411k ***other - 2 0.000re 0.00cp 0avio 0k 1234567890123456 - 3 0.000re 0.00cp 0avio 0k ln - 9 0.205re 0.00cp 0avio 40400k time + 28 0.425re 0.10cp 143avio 477k + 14 0.220re 0.10cp 286avio 411k ***other + 2 0.000re 0.00cp 0avio 0k 1234567890123456 + 3 0.000re 0.00cp 0avio 0k ln + 9 0.205re 0.00cp 0avio 40400k time Index: head/tools/regression/usr.sbin/sa/v1-i386-u.out =================================================================== --- head/tools/regression/usr.sbin/sa/v1-i386-u.out (revision 263082) +++ head/tools/regression/usr.sbin/sa/v1-i386-u.out (revision 263083) @@ -1,28 +1,28 @@ - 0 0.000 cpu 264k mem 0 io accton - 0 0.453 cpu 41k mem 0 io awk - 0 0.000 cpu 0k mem 0 io time - 0 4.984 cpu 41k mem 28 io egrep - 0 0.000 cpu 140k mem 0 io time - 0 0.266 cpu 36k mem 3921 io find - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io sleep - 0 0.000 cpu 0k mem 0 io time - 0 0.016 cpu 25k mem 16 io dd - 0 0.000 cpu 0k mem 0 io time - 0 0.312 cpu 1361k mem 0 io diff - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io 123456789012345 - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io 1234567890123456 - 0 0.000 cpu 264k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io 1234567890123456 - 0 0.000 cpu 0k mem 0 io time - 0 0.016 cpu 233k mem 1 io cc1 - 0 0.000 cpu 482k mem 1 io as - 0 0.000 cpu 0k mem 11 io ld - 0 0.000 cpu 0k mem 6 io cc - 0 0.000 cpu 0k mem 12 io core - 0 0.000 cpu 0k mem 7 io core* + 0 0.000 cpu 264k mem 0 io accton + 0 0.453 cpu 41k mem 0 io awk + 0 0.000 cpu 0k mem 0 io time + 0 4.984 cpu 41k mem 28 io egrep + 0 0.000 cpu 140k mem 0 io time + 0 0.266 cpu 36k mem 3921 io find + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io sleep + 0 0.000 cpu 0k mem 0 io time + 0 0.016 cpu 25k mem 16 io dd + 0 0.000 cpu 0k mem 0 io time + 0 0.312 cpu 1361k mem 0 io diff + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io 123456789012345 + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io 1234567890123456 + 0 0.000 cpu 264k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io 1234567890123456 + 0 0.000 cpu 0k mem 0 io time + 0 0.016 cpu 233k mem 1 io cc1 + 0 0.000 cpu 482k mem 1 io as + 0 0.000 cpu 0k mem 11 io ld + 0 0.000 cpu 0k mem 6 io cc + 0 0.000 cpu 0k mem 12 io core + 0 0.000 cpu 0k mem 7 io core* Index: head/tools/regression/usr.sbin/sa/v1-i386-usr.out =================================================================== --- head/tools/regression/usr.sbin/sa/v1-i386-usr.out (revision 263082) +++ head/tools/regression/usr.sbin/sa/v1-i386-usr.out (revision 263083) @@ -1 +1 @@ -root 28 0.10cpu 4003tio 2887k*sec +root 28 0.10cpu 4003tio 2887k*sec Index: head/tools/regression/usr.sbin/sa/v1-sparc64-sav.out =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: head/tools/regression/usr.sbin/sa/v1-sparc64-u.out =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: head/tools/regression/usr.sbin/sa/v1-sparc64-usr.out =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: head/tools/regression/usr.sbin/sa/v2-amd64-u.out =================================================================== --- head/tools/regression/usr.sbin/sa/v2-amd64-u.out (revision 263082) +++ head/tools/regression/usr.sbin/sa/v2-amd64-u.out (revision 263083) @@ -1,28 +1,28 @@ - 0 0.002 cpu 68k mem 0 io accton - 0 0.163 cpu 35k mem 0 io awk - 0 0.003 cpu 0k mem 0 io time - 0 3.247 cpu 29k mem 26 io egrep - 0 0.003 cpu 93k mem 0 io time - 0 0.822 cpu 19k mem 4472 io find - 0 0.003 cpu 0k mem 0 io time - 0 0.002 cpu 0k mem 0 io sleep - 0 0.004 cpu 88k mem 0 io time - 0 0.076 cpu 18k mem 16 io dd - 0 0.003 cpu 0k mem 0 io time - 0 0.223 cpu 24k mem 0 io diff - 0 0.003 cpu 0k mem 0 io time - 0 0.003 cpu 0k mem 0 io ln - 0 0.002 cpu 0k mem 0 io 123456789012345 - 0 0.003 cpu 0k mem 0 io time - 0 0.002 cpu 0k mem 0 io ln - 0 0.002 cpu 0k mem 0 io 1234567890123456 - 0 0.003 cpu 0k mem 0 io time - 0 0.002 cpu 0k mem 0 io ln - 0 0.002 cpu 70k mem 0 io 1234567890123456 - 0 0.003 cpu 0k mem 0 io time - 0 0.024 cpu 661k mem 2 io cc1 - 0 0.005 cpu 0k mem 1 io as - 0 0.014 cpu 192k mem 9 io ld - 0 0.005 cpu 162k mem 5 io cc - 0 0.005 cpu 0k mem 13 io core - 0 0.002 cpu 0k mem 7 io core* + 0 0.002 cpu 68k mem 0 io accton + 0 0.163 cpu 35k mem 0 io awk + 0 0.003 cpu 0k mem 0 io time + 0 3.247 cpu 29k mem 26 io egrep + 0 0.003 cpu 93k mem 0 io time + 0 0.822 cpu 19k mem 4472 io find + 0 0.003 cpu 0k mem 0 io time + 0 0.002 cpu 0k mem 0 io sleep + 0 0.004 cpu 88k mem 0 io time + 0 0.076 cpu 18k mem 16 io dd + 0 0.003 cpu 0k mem 0 io time + 0 0.223 cpu 24k mem 0 io diff + 0 0.003 cpu 0k mem 0 io time + 0 0.003 cpu 0k mem 0 io ln + 0 0.002 cpu 0k mem 0 io 123456789012345 + 0 0.003 cpu 0k mem 0 io time + 0 0.002 cpu 0k mem 0 io ln + 0 0.002 cpu 0k mem 0 io 1234567890123456 + 0 0.003 cpu 0k mem 0 io time + 0 0.002 cpu 0k mem 0 io ln + 0 0.002 cpu 70k mem 0 io 1234567890123456 + 0 0.003 cpu 0k mem 0 io time + 0 0.024 cpu 661k mem 2 io cc1 + 0 0.005 cpu 0k mem 1 io as + 0 0.014 cpu 192k mem 9 io ld + 0 0.005 cpu 162k mem 5 io cc + 0 0.005 cpu 0k mem 13 io core + 0 0.002 cpu 0k mem 7 io core* Index: head/tools/regression/usr.sbin/sa/v2-i386-u.out =================================================================== --- head/tools/regression/usr.sbin/sa/v2-i386-u.out (revision 263082) +++ head/tools/regression/usr.sbin/sa/v2-i386-u.out (revision 263083) @@ -1,28 +1,28 @@ - 0 0.001 cpu 0k mem 0 io accton - 0 0.448 cpu 112k mem 0 io awk - 0 0.001 cpu 0k mem 0 io time - 0 6.680 cpu 110k mem 0 io egrep - 0 0.001 cpu 0k mem 0 io time - 0 0.248 cpu 108k mem 0 io find - 0 0.001 cpu 0k mem 0 io time - 0 0.001 cpu 0k mem 0 io sleep - 0 0.001 cpu 0k mem 0 io time - 0 0.025 cpu 103k mem 16 io dd - 0 0.001 cpu 0k mem 0 io time - 0 0.423 cpu 110k mem 0 io diff - 0 0.001 cpu 0k mem 0 io time - 0 0.001 cpu 0k mem 0 io ln - 0 0.001 cpu 0k mem 0 io 123456789012345 - 0 0.001 cpu 0k mem 0 io time - 0 0.001 cpu 0k mem 0 io ln - 0 0.001 cpu 0k mem 0 io 1234567890123456 - 0 0.001 cpu 140k mem 0 io time - 0 0.001 cpu 0k mem 0 io ln - 0 0.001 cpu 0k mem 0 io 1234567890123456 - 0 0.001 cpu 0k mem 0 io time - 0 0.016 cpu 620k mem 0 io cc1 - 0 0.002 cpu 432k mem 0 io as - 0 0.028 cpu 96k mem 0 io ld - 0 0.002 cpu 0k mem 0 io cc - 0 0.002 cpu 68k mem 12 io core - 0 0.000 cpu 0k mem 7 io core* + 0 0.001 cpu 0k mem 0 io accton + 0 0.448 cpu 112k mem 0 io awk + 0 0.001 cpu 0k mem 0 io time + 0 6.680 cpu 110k mem 0 io egrep + 0 0.001 cpu 0k mem 0 io time + 0 0.248 cpu 108k mem 0 io find + 0 0.001 cpu 0k mem 0 io time + 0 0.001 cpu 0k mem 0 io sleep + 0 0.001 cpu 0k mem 0 io time + 0 0.025 cpu 103k mem 16 io dd + 0 0.001 cpu 0k mem 0 io time + 0 0.423 cpu 110k mem 0 io diff + 0 0.001 cpu 0k mem 0 io time + 0 0.001 cpu 0k mem 0 io ln + 0 0.001 cpu 0k mem 0 io 123456789012345 + 0 0.001 cpu 0k mem 0 io time + 0 0.001 cpu 0k mem 0 io ln + 0 0.001 cpu 0k mem 0 io 1234567890123456 + 0 0.001 cpu 140k mem 0 io time + 0 0.001 cpu 0k mem 0 io ln + 0 0.001 cpu 0k mem 0 io 1234567890123456 + 0 0.001 cpu 0k mem 0 io time + 0 0.016 cpu 620k mem 0 io cc1 + 0 0.002 cpu 432k mem 0 io as + 0 0.028 cpu 96k mem 0 io ld + 0 0.002 cpu 0k mem 0 io cc + 0 0.002 cpu 68k mem 12 io core + 0 0.000 cpu 0k mem 7 io core* Index: head/tools/regression/usr.sbin/sa/v2-sparc64-u.out =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream