MFC various moves of tools/regressions/ tests to the new infrastructure.

- r263220 Migrate tools/regression/sbin/ to the new tests layout.
- r263222 Add Makefile missed in r263220.
- r263226 Migrate tools/regression/{usr.bin/lastcomm,usr.sbin}/ to the new tests layout.
- r263227 Migrate most of tools/regression/usr.bin/ to the new tests layout.
- r263345 Expand tabs that sneaked in into spaces.
- r263346 Migrate tools/regression/usr.bin/make/ to the new tests layout.
- r263348 Add Makefiles missed in r263346.
- r263351 Migrate tools/regression/usr.bin/pkill/ to the new tests layout.
- r263388 Mark multi_test as requiring /usr/share/dict/words.
- r263814 Fix path to the run.pl script to let these tests run.
- r264742 Prevent building tests when bootstrapping make.

This is 'make tinderbox' clean.

28 files changed, 348 insertions, 0 deletions

diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index 0adf1f8..23f9bf2 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,9 +1,15 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .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 <bsd.prog.mk>
diff --git a/usr.sbin/sa/tests/Makefile b/usr.sbin/sa/tests/Makefile
new file mode 100644
index 0000000..204b510
--- /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 <bsd.test.mk>
diff --git a/usr.sbin/sa/tests/legacy_test.sh b/usr.sbin/sa/tests/legacy_test.sh
new file mode 100644
index 0000000..d0d8f42
--- /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/usr.sbin/sa/tests/prime.sh b/usr.sbin/sa/tests/prime.sh
new file mode 100755
index 0000000..6992f45
--- /dev/null
+++ b/usr.sbin/sa/tests/prime.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Configure and run this script to create the files for regression testing
+# for a new architecture/configuration.
+#
+# $FreeBSD$
+#
+
+TZ=UTC; export TZ
+
+# Set this to the path of the current sa command
+SANEW=/usr/sbin/sa
+
+# Set this to the path of the sa as of 2007-05-19.
+# You can obtain it with a command like:
+# cvs co -D '2007-05-19' sa
+# To compile it you will also need sys/acct.h from that date
+# and sa configured to use that file, instead of the current version.
+SAOLD=/$HOME/src/sa/sa
+
+# Machine architecture
+ARCH=`uname -m`
+
+# Location of lastcomm regression files
+LCDIR=../../usr.bin/lastcomm
+
+$SANEW -u $LCDIR/v1-$ARCH-acct.in >v1-$ARCH-u.out
+$SANEW -u $LCDIR/v2-$ARCH-acct.in >v2-$ARCH-u.out
+$SANEW -i $LCDIR/v1-$ARCH-acct.in >v1-$ARCH-sav.out
+$SANEW -im $LCDIR/v1-$ARCH-acct.in >v1-$ARCH-usr.out
+cp $LCDIR/v1-$ARCH-acct.in acct.in
+rm -f v1-$ARCH-sav.in v1-$ARCH-usr.in
+$SAOLD -s -P v1-$ARCH-sav.in -U v1-$ARCH-usr.in acct.in >/dev/null
+cp $LCDIR/v1-$ARCH-acct.in acct.in
+rm -f v2-$ARCH-sav.in v2-$ARCH-usr.in
+$SANEW -s -P v2-$ARCH-sav.in -U v2-$ARCH-usr.in acct.in >/dev/null
+rm acct.in
diff --git a/usr.sbin/sa/tests/v1-amd64-sav.in b/usr.sbin/sa/tests/v1-amd64-sav.in
new file mode 100644
index 0000000..adc38dd
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-amd64-sav.in
diff --git a/usr.sbin/sa/tests/v1-amd64-sav.out b/usr.sbin/sa/tests/v1-amd64-sav.out
new file mode 100644
index 0000000..a2289ee
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-amd64-sav.out
@@ -0,0 +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*
diff --git a/usr.sbin/sa/tests/v1-amd64-u.out b/usr.sbin/sa/tests/v1-amd64-u.out
new file mode 100644
index 0000000..4c13b76
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-amd64-u.out
@@ -0,0 +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*
diff --git a/usr.sbin/sa/tests/v1-amd64-usr.in b/usr.sbin/sa/tests/v1-amd64-usr.in
new file mode 100644
index 0000000..6896d32
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-amd64-usr.in
diff --git a/usr.sbin/sa/tests/v1-amd64-usr.out b/usr.sbin/sa/tests/v1-amd64-usr.out
new file mode 100644
index 0000000..2282808
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-amd64-usr.out
@@ -0,0 +1 @@
+root 28 0.06cpu 1130tio 3514k*sec
diff --git a/usr.sbin/sa/tests/v1-i386-sav.in b/usr.sbin/sa/tests/v1-i386-sav.in
new file mode 100644
index 0000000..4ed7aef
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-i386-sav.in
diff --git a/usr.sbin/sa/tests/v1-i386-sav.out b/usr.sbin/sa/tests/v1-i386-sav.out
new file mode 100644
index 0000000..a8d68b1
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-i386-sav.out
@@ -0,0 +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
diff --git a/usr.sbin/sa/tests/v1-i386-u.out b/usr.sbin/sa/tests/v1-i386-u.out
new file mode 100644
index 0000000..17c28be
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-i386-u.out
@@ -0,0 +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*
diff --git a/usr.sbin/sa/tests/v1-i386-usr.in b/usr.sbin/sa/tests/v1-i386-usr.in
new file mode 100644
index 0000000..791b6ed
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-i386-usr.in
diff --git a/usr.sbin/sa/tests/v1-i386-usr.out b/usr.sbin/sa/tests/v1-i386-usr.out
new file mode 100644
index 0000000..cf9e7bd
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-i386-usr.out
@@ -0,0 +1 @@
+root 28 0.10cpu 4003tio 2887k*sec
diff --git a/usr.sbin/sa/tests/v1-sparc64-sav.in b/usr.sbin/sa/tests/v1-sparc64-sav.in
new file mode 100644
index 0000000..d6911cf
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-sparc64-sav.in
diff --git a/usr.sbin/sa/tests/v1-sparc64-sav.out b/usr.sbin/sa/tests/v1-sparc64-sav.out
new file mode 100644
index 0000000..1905420
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-sparc64-sav.out
@@ -0,0 +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

diff --git a/usr.sbin/sa/tests/v1-sparc64-u.out b/usr.sbin/sa/tests/v1-sparc64-u.out
new file mode 100644
index 0000000..d0ecb51
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-sparc64-u.out
@@ -0,0 +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*

diff --git a/usr.sbin/sa/tests/v1-sparc64-usr.in b/usr.sbin/sa/tests/v1-sparc64-usr.in
new file mode 100644
index 0000000..08d795b
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-sparc64-usr.in
diff --git a/usr.sbin/sa/tests/v1-sparc64-usr.out b/usr.sbin/sa/tests/v1-sparc64-usr.out
new file mode 100644
index 0000000..cab001f
--- /dev/null
+++ b/usr.sbin/sa/tests/v1-sparc64-usr.out
@@ -0,0 +1 @@
+root 28 0.66cpu 4508tio 9971k*sec

diff --git a/usr.sbin/sa/tests/v2-amd64-sav.in b/usr.sbin/sa/tests/v2-amd64-sav.in
new file mode 100644
index 0000000..24f863b
--- /dev/null
+++ b/usr.sbin/sa/tests/v2-amd64-sav.in
diff --git a/usr.sbin/sa/tests/v2-amd64-u.out b/usr.sbin/sa/tests/v2-amd64-u.out
new file mode 100644
index 0000000..4196f4a
--- /dev/null
+++ b/usr.sbin/sa/tests/v2-amd64-u.out
@@ -0,0 +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*
diff --git a/usr.sbin/sa/tests/v2-amd64-usr.in b/usr.sbin/sa/tests/v2-amd64-usr.in
new file mode 100644
index 0000000..4c3b136
--- /dev/null
+++ b/usr.sbin/sa/tests/v2-amd64-usr.in
diff --git a/usr.sbin/sa/tests/v2-i386-sav.in b/usr.sbin/sa/tests/v2-i386-sav.in
new file mode 100644
index 0000000..d3172db
--- /dev/null
+++ b/usr.sbin/sa/tests/v2-i386-sav.in
diff --git a/usr.sbin/sa/tests/v2-i386-u.out b/usr.sbin/sa/tests/v2-i386-u.out
new file mode 100644
index 0000000..b553eb8
--- /dev/null
+++ b/usr.sbin/sa/tests/v2-i386-u.out
@@ -0,0 +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*
diff --git a/usr.sbin/sa/tests/v2-i386-usr.in b/usr.sbin/sa/tests/v2-i386-usr.in
new file mode 100644
index 0000000..465fdb4
--- /dev/null
+++ b/usr.sbin/sa/tests/v2-i386-usr.in
diff --git a/usr.sbin/sa/tests/v2-sparc64-sav.in b/usr.sbin/sa/tests/v2-sparc64-sav.in
new file mode 100644
index 0000000..b6d836a
--- /dev/null
+++ b/usr.sbin/sa/tests/v2-sparc64-sav.in
diff --git a/usr.sbin/sa/tests/v2-sparc64-u.out b/usr.sbin/sa/tests/v2-sparc64-u.out
new file mode 100644
index 0000000..9339238
--- /dev/null
+++ b/usr.sbin/sa/tests/v2-sparc64-u.out
@@ -0,0 +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*

diff --git a/usr.sbin/sa/tests/v2-sparc64-usr.in b/usr.sbin/sa/tests/v2-sparc64-usr.in
new file mode 100644
index 0000000..01a1bdc
--- /dev/null
+++ b/usr.sbin/sa/tests/v2-sparc64-usr.in