d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sa tests.

Browse Source 
Small divergences in the output padding made some sa tests fail.  Just
trim all whitespace from the outputs and the golden files so comparisons
are less fragile and the tests pass again.
This commit is contained in:
jmmv 2014-03-12 10:41:14 +00:00
parent e0a76714e7
commit 142e11049e
13 changed files with 202 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/regression/usr.sbin/sa/regress.t
View File

@ -7,10 +7,16 @@ 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"
@ -64,7 +70,8 @@ sa -m -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null |
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

10
tools/regression/usr.sbin/sa/v1-amd64-sav.out
View File

@ -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*

56
tools/regression/usr.sbin/sa/v1-amd64-u.out
View File

@ -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*

2
tools/regression/usr.sbin/sa/v1-amd64-usr.out
View File

@ -1 +1 @@
root 28 0.06cpu 1130tio 3514k*sec
root 28 0.06cpu 1130tio 3514k*sec

10
tools/regression/usr.sbin/sa/v1-i386-sav.out
View File

@ -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

56
tools/regression/usr.sbin/sa/v1-i386-u.out
View File

@ -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*

2
tools/regression/usr.sbin/sa/v1-i386-usr.out
View File

@ -1 +1 @@
root 28 0.10cpu 4003tio 2887k*sec
root 28 0.10cpu 4003tio 2887k*sec

10
tools/regression/usr.sbin/sa/v1-sparc64-sav.out
View File

@ -1,5 +1,5 @@
28 1.839re 0.66cp 161avio 252k
14 0.930re 0.66cp 322avio 197k ***other
9 0.908re 0.00cp 0avio 10190k time
3 0.001re 0.00cp 0avio 16256k ln
2 0.001re 0.00cp 0avio 27900k 1234567890123456
28 1.839re 0.66cp 161avio 252k
14 0.930re 0.66cp 322avio 197k ***other
9 0.908re 0.00cp 0avio 10190k time
3 0.001re 0.00cp 0avio 16256k ln
2 0.001re 0.00cp 0avio 27900k 1234567890123456

56
tools/regression/usr.sbin/sa/v1-sparc64-u.out
View File

@ -1,28 +1,28 @@
0 0.016 cpu 162k mem 0 io accton
0 1.609 cpu 273k mem 0 io awk
0 0.016 cpu 174k mem 0 io time
0 29.750 cpu 233k mem 26 io egrep
0 0.016 cpu 161k mem 0 io time
0 5.516 cpu 184k mem 4437 io find
0 0.016 cpu 156k mem 0 io time
0 0.000 cpu 136k mem 0 io sleep
0 0.016 cpu 152k mem 0 io time
0 0.562 cpu 161k mem 16 io dd
0 0.016 cpu 156k mem 0 io time
0 1.641 cpu 193k mem 0 io diff
0 0.016 cpu 156k mem 0 io time
0 0.000 cpu 169k mem 0 io ln
0 0.000 cpu 144k mem 0 io 123456789012345
0 0.016 cpu 166k mem 0 io time
0 0.016 cpu 170k mem 0 io ln
0 0.000 cpu 144k mem 0 io 1234567890123456
0 0.016 cpu 156k mem 0 io time
0 0.016 cpu 169k mem 0 io ln
0 0.000 cpu 135k mem 0 io 1234567890123456
0 0.016 cpu 156k mem 0 io time
0 0.094 cpu 3462k mem 2 io cc1
0 0.016 cpu 1047k mem 1 io as
0 0.094 cpu 1118k mem 10 io ld
0 0.016 cpu 361k mem 5 io cc
0 0.031 cpu 165k mem 7 io core
0 0.000 cpu 112k mem 4 io core*
0 0.016 cpu 162k mem 0 io accton
0 1.609 cpu 273k mem 0 io awk
0 0.016 cpu 174k mem 0 io time
0 29.750 cpu 233k mem 26 io egrep
0 0.016 cpu 161k mem 0 io time
0 5.516 cpu 184k mem 4437 io find
0 0.016 cpu 156k mem 0 io time
0 0.000 cpu 136k mem 0 io sleep
0 0.016 cpu 152k mem 0 io time
0 0.562 cpu 161k mem 16 io dd
0 0.016 cpu 156k mem 0 io time
0 1.641 cpu 193k mem 0 io diff
0 0.016 cpu 156k mem 0 io time
0 0.000 cpu 169k mem 0 io ln
0 0.000 cpu 144k mem 0 io 123456789012345
0 0.016 cpu 166k mem 0 io time
0 0.016 cpu 170k mem 0 io ln
0 0.000 cpu 144k mem 0 io 1234567890123456
0 0.016 cpu 156k mem 0 io time
0 0.016 cpu 169k mem 0 io ln
0 0.000 cpu 135k mem 0 io 1234567890123456
0 0.016 cpu 156k mem 0 io time
0 0.094 cpu 3462k mem 2 io cc1
0 0.016 cpu 1047k mem 1 io as
0 0.094 cpu 1118k mem 10 io ld
0 0.016 cpu 361k mem 5 io cc
0 0.031 cpu 165k mem 7 io core
0 0.000 cpu 112k mem 4 io core*

2
tools/regression/usr.sbin/sa/v1-sparc64-usr.out
View File

@ -1 +1 @@
root 28 0.66cpu 4508tio 9971k*sec
root 28 0.66cpu 4508tio 9971k*sec

56
tools/regression/usr.sbin/sa/v2-amd64-u.out
View File

@ -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*

56
tools/regression/usr.sbin/sa/v2-i386-u.out
View File

@ -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*

72
tools/regression/usr.sbin/sa/v2-sparc64-u.out
View File

@ -1,36 +1,36 @@
0 0.019 cpu 163k mem 0 io accton
0 1.644 cpu 272k mem 0 io awk
0 0.029 cpu 175k mem 0 io time
0 0.019 cpu 163k mem 0 io sleep
0 0.032 cpu 214k mem 35 io fsck_ufs
0 0.028 cpu 213k mem 10 io fsck_ufs
0 0.028 cpu 189k mem 8 io fsck_ufs
0 0.028 cpu 196k mem 7 io fsck_ufs
0 0.055 cpu 168k mem 0 io fsck
0 0.008 cpu 204k mem 0 io sh*
0 0.023 cpu 179k mem 0 io logger
0 26.715 cpu 233k mem 25 io egrep
0 0.029 cpu 162k mem 0 io time
0 5.703 cpu 184k mem 4444 io find
0 0.029 cpu 166k mem 0 io time
0 0.018 cpu 136k mem 0 io sleep
0 0.028 cpu 157k mem 0 io time
0 0.588 cpu 160k mem 16 io dd
0 0.027 cpu 162k mem 0 io time
0 1.636 cpu 193k mem 0 io diff
0 0.029 cpu 172k mem 0 io time
0 0.020 cpu 170k mem 0 io ln
0 0.018 cpu 135k mem 0 io 123456789012345
0 0.029 cpu 167k mem 0 io time
0 0.019 cpu 163k mem 0 io ln
0 0.017 cpu 135k mem 0 io 1234567890123456
0 0.029 cpu 157k mem 0 io time
0 0.019 cpu 163k mem 0 io ln
0 0.017 cpu 135k mem 0 io 1234567890123456
0 0.029 cpu 162k mem 0 io time
0 0.105 cpu 3358k mem 2 io cc1
0 0.030 cpu 996k mem 1 io as
0 0.186 cpu 1114k mem 11 io ld
0 0.033 cpu 386k mem 6 io cc
0 0.037 cpu 158k mem 12 io core
0 0.010 cpu 129k mem 7 io core*
0 0.019 cpu 163k mem 0 io accton
0 1.644 cpu 272k mem 0 io awk
0 0.029 cpu 175k mem 0 io time
0 0.019 cpu 163k mem 0 io sleep
0 0.032 cpu 214k mem 35 io fsck_ufs
0 0.028 cpu 213k mem 10 io fsck_ufs
0 0.028 cpu 189k mem 8 io fsck_ufs
0 0.028 cpu 196k mem 7 io fsck_ufs
0 0.055 cpu 168k mem 0 io fsck
0 0.008 cpu 204k mem 0 io sh*
0 0.023 cpu 179k mem 0 io logger
0 26.715 cpu 233k mem 25 io egrep
0 0.029 cpu 162k mem 0 io time
0 5.703 cpu 184k mem 4444 io find
0 0.029 cpu 166k mem 0 io time
0 0.018 cpu 136k mem 0 io sleep
0 0.028 cpu 157k mem 0 io time
0 0.588 cpu 160k mem 16 io dd
0 0.027 cpu 162k mem 0 io time
0 1.636 cpu 193k mem 0 io diff
0 0.029 cpu 172k mem 0 io time
0 0.020 cpu 170k mem 0 io ln
0 0.018 cpu 135k mem 0 io 123456789012345
0 0.029 cpu 167k mem 0 io time
0 0.019 cpu 163k mem 0 io ln
0 0.017 cpu 135k mem 0 io 1234567890123456
0 0.029 cpu 157k mem 0 io time
0 0.019 cpu 163k mem 0 io ln
0 0.017 cpu 135k mem 0 io 1234567890123456
0 0.029 cpu 162k mem 0 io time
0 0.105 cpu 3358k mem 2 io cc1
0 0.030 cpu 996k mem 1 io as
0 0.186 cpu 1114k mem 11 io ld
0 0.033 cpu 386k mem 6 io cc
0 0.037 cpu 158k mem 12 io core
0 0.010 cpu 129k mem 7 io core*