svn commit: r263083 - head/tools/regression/usr.sbin/sa
Julio Merino
jmmv at FreeBSD.org
Wed Mar 12 10:41:16 UTC 2014
Author: jmmv
Date: Wed Mar 12 10:41:14 2014
New Revision: 263083
URL: http://svnweb.freebsd.org/changeset/base/263083
Log:
Fix sa tests.
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.
Modified:
head/tools/regression/usr.sbin/sa/regress.t
head/tools/regression/usr.sbin/sa/v1-amd64-sav.out
head/tools/regression/usr.sbin/sa/v1-amd64-u.out
head/tools/regression/usr.sbin/sa/v1-amd64-usr.out
head/tools/regression/usr.sbin/sa/v1-i386-sav.out
head/tools/regression/usr.sbin/sa/v1-i386-u.out
head/tools/regression/usr.sbin/sa/v1-i386-usr.out
head/tools/regression/usr.sbin/sa/v1-sparc64-sav.out
head/tools/regression/usr.sbin/sa/v1-sparc64-u.out
head/tools/regression/usr.sbin/sa/v1-sparc64-usr.out
head/tools/regression/usr.sbin/sa/v2-amd64-u.out
head/tools/regression/usr.sbin/sa/v2-i386-u.out
head/tools/regression/usr.sbin/sa/v2-sparc64-u.out
Modified: head/tools/regression/usr.sbin/sa/regress.t
==============================================================================
--- head/tools/regression/usr.sbin/sa/regress.t Wed Mar 12 10:38:32 2014 (r263082)
+++ head/tools/regression/usr.sbin/sa/regress.t Wed Mar 12 10:41:14 2014 (r263083)
@@ -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/v
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
Modified: head/tools/regression/usr.sbin/sa/v1-amd64-sav.out
==============================================================================
--- head/tools/regression/usr.sbin/sa/v1-amd64-sav.out Wed Mar 12 10:38:32 2014 (r263082)
+++ head/tools/regression/usr.sbin/sa/v1-amd64-sav.out Wed Mar 12 10:41:14 2014 (r263083)
@@ -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*
Modified: head/tools/regression/usr.sbin/sa/v1-amd64-u.out
==============================================================================
--- head/tools/regression/usr.sbin/sa/v1-amd64-u.out Wed Mar 12 10:38:32 2014 (r263082)
+++ head/tools/regression/usr.sbin/sa/v1-amd64-u.out Wed Mar 12 10:41:14 2014 (r263083)
@@ -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*
Modified: head/tools/regression/usr.sbin/sa/v1-amd64-usr.out
==============================================================================
--- head/tools/regression/usr.sbin/sa/v1-amd64-usr.out Wed Mar 12 10:38:32 2014 (r263082)
+++ head/tools/regression/usr.sbin/sa/v1-amd64-usr.out Wed Mar 12 10:41:14 2014 (r263083)
@@ -1 +1 @@
-root 28 0.06cpu 1130tio 3514k*sec
+root 28 0.06cpu 1130tio 3514k*sec
Modified: head/tools/regression/usr.sbin/sa/v1-i386-sav.out
==============================================================================
--- head/tools/regression/usr.sbin/sa/v1-i386-sav.out Wed Mar 12 10:38:32 2014 (r263082)
+++ head/tools/regression/usr.sbin/sa/v1-i386-sav.out Wed Mar 12 10:41:14 2014 (r263083)
@@ -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
Modified: head/tools/regression/usr.sbin/sa/v1-i386-u.out
==============================================================================
--- head/tools/regression/usr.sbin/sa/v1-i386-u.out Wed Mar 12 10:38:32 2014 (r263082)
+++ head/tools/regression/usr.sbin/sa/v1-i386-u.out Wed Mar 12 10:41:14 2014 (r263083)
@@ -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*
Modified: head/tools/regression/usr.sbin/sa/v1-i386-usr.out
==============================================================================
--- head/tools/regression/usr.sbin/sa/v1-i386-usr.out Wed Mar 12 10:38:32 2014 (r263082)
+++ head/tools/regression/usr.sbin/sa/v1-i386-usr.out Wed Mar 12 10:41:14 2014 (r263083)
@@ -1 +1 @@
-root 28 0.10cpu 4003tio 2887k*sec
+root 28 0.10cpu 4003tio 2887k*sec
Modified: head/tools/regression/usr.sbin/sa/v1-sparc64-sav.out
==============================================================================
Binary file (source and/or target). No diff available.
Modified: head/tools/regression/usr.sbin/sa/v1-sparc64-u.out
==============================================================================
Binary file (source and/or target). No diff available.
Modified: head/tools/regression/usr.sbin/sa/v1-sparc64-usr.out
==============================================================================
Binary file (source and/or target). No diff available.
Modified: head/tools/regression/usr.sbin/sa/v2-amd64-u.out
==============================================================================
--- head/tools/regression/usr.sbin/sa/v2-amd64-u.out Wed Mar 12 10:38:32 2014 (r263082)
+++ head/tools/regression/usr.sbin/sa/v2-amd64-u.out Wed Mar 12 10:41:14 2014 (r263083)
@@ -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*
Modified: head/tools/regression/usr.sbin/sa/v2-i386-u.out
==============================================================================
--- head/tools/regression/usr.sbin/sa/v2-i386-u.out Wed Mar 12 10:38:32 2014 (r263082)
+++ head/tools/regression/usr.sbin/sa/v2-i386-u.out Wed Mar 12 10:41:14 2014 (r263083)
@@ -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*
Modified: head/tools/regression/usr.sbin/sa/v2-sparc64-u.out
==============================================================================
Binary file (source and/or target). No diff available.
More information about the svn-src-head
mailing list