git: 82a8b8f0cfd0 - stable/13 - lastcomm/sa: Remove sparc64 tests, they aren't needed.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 13 Jul 2022 11:48:11 UTC
The branch stable/13 has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=82a8b8f0cfd0b83de47d22a60a199244dc19438e
commit 82a8b8f0cfd0b83de47d22a60a199244dc19438e
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-10-04 16:38:37 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2022-07-13 11:17:40 +0000
lastcomm/sa: Remove sparc64 tests, they aren't needed.
Fix delete-old, since 22375931 MFC, annoy to delete them manually
every make delete-old.
These tests will run only on a sparc64 system, and so never run anymore.
Sponsored by: Netflix
(cherry picked from commit d6dffbae96621a6fbc804c5f31dff6648e0a122c)
---
usr.bin/lastcomm/tests/Makefile | 6 +----
usr.bin/lastcomm/tests/v1-sparc64-acct.in | Bin 1568 -> 0 bytes
usr.bin/lastcomm/tests/v1-sparc64.out | 28 -----------------------
usr.bin/lastcomm/tests/v2-sparc64-acct.in | Bin 2592 -> 0 bytes
usr.bin/lastcomm/tests/v2-sparc64.out | 36 ------------------------------
usr.sbin/sa/tests/Makefile | 10 +--------
usr.sbin/sa/tests/v1-sparc64-sav.in | Bin 16384 -> 0 bytes
usr.sbin/sa/tests/v1-sparc64-sav.out | 5 -----
usr.sbin/sa/tests/v1-sparc64-u.out | 28 -----------------------
usr.sbin/sa/tests/v1-sparc64-usr.in | Bin 16384 -> 0 bytes
usr.sbin/sa/tests/v1-sparc64-usr.out | 1 -
usr.sbin/sa/tests/v2-sparc64-sav.in | Bin 16384 -> 0 bytes
usr.sbin/sa/tests/v2-sparc64-u.out | 36 ------------------------------
usr.sbin/sa/tests/v2-sparc64-usr.in | Bin 16384 -> 0 bytes
14 files changed, 2 insertions(+), 148 deletions(-)
diff --git a/usr.bin/lastcomm/tests/Makefile b/usr.bin/lastcomm/tests/Makefile
index 9a38743c903b..db6aec3b69fa 100644
--- a/usr.bin/lastcomm/tests/Makefile
+++ b/usr.bin/lastcomm/tests/Makefile
@@ -3,19 +3,15 @@
PACKAGE= tests
TAP_TESTS_SH= legacy_test
-TEST_METADATA.legacy_test+= allowed_architectures="amd64 i386 sparc64"
+TEST_METADATA.legacy_test+= allowed_architectures="amd64 i386"
${PACKAGE}FILES+= v1-amd64-acct.in
${PACKAGE}FILES+= v1-amd64.out
${PACKAGE}FILES+= v1-i386-acct.in
${PACKAGE}FILES+= v1-i386.out
-${PACKAGE}FILES+= v1-sparc64-acct.in
-${PACKAGE}FILES+= v1-sparc64.out
${PACKAGE}FILES+= v2-amd64-acct.in
${PACKAGE}FILES+= v2-amd64.out
${PACKAGE}FILES+= v2-i386-acct.in
${PACKAGE}FILES+= v2-i386.out
-${PACKAGE}FILES+= v2-sparc64-acct.in
-${PACKAGE}FILES+= v2-sparc64.out
.include <bsd.test.mk>
diff --git a/usr.bin/lastcomm/tests/v1-sparc64-acct.in b/usr.bin/lastcomm/tests/v1-sparc64-acct.in
deleted file mode 100644
index 00f05b423fc5..000000000000
Binary files a/usr.bin/lastcomm/tests/v1-sparc64-acct.in and /dev/null differ
diff --git a/usr.bin/lastcomm/tests/v1-sparc64.out b/usr.bin/lastcomm/tests/v1-sparc64.out
deleted file mode 100644
index d33ae719fb53..000000000000
--- a/usr.bin/lastcomm/tests/v1-sparc64.out
+++ /dev/null
@@ -1,28 +0,0 @@
-core -FDX root 0.000 secs 0.000 us 0.000 sy 0.031 es Wed May 16 12:16
-core -DX root 0.031 secs 0.000 us 0.031 sy 0.047 es Wed May 16 12:16
-cc - root 0.016 secs 0.000 us 0.016 sy 0.859 es Wed May 16 12:16
-ld - root 0.094 secs 0.047 us 0.047 sy 0.266 es Wed May 16 12:16
-as - root 0.016 secs 0.000 us 0.016 sy 0.094 es Wed May 16 12:16
-cc1 - root 0.094 secs 0.047 us 0.047 sy 0.375 es Wed May 16 12:16
-time - root 0.016 secs 0.000 us 0.016 sy 0.047 es Wed May 16 12:16
-1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 12:16
-ln - root 0.016 secs 0.000 us 0.016 sy 0.016 es Wed May 16 12:16
-time - root 0.016 secs 0.000 us 0.016 sy 0.047 es Wed May 16 12:16
-1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 12:16
-ln - root 0.016 secs 0.000 us 0.016 sy 0.016 es Wed May 16 12:16
-time - root 0.016 secs 0.000 us 0.016 sy 0.047 es Wed May 16 12:16
-123456789012345 - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 12:16
-ln - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 12:16
-time - root 0.016 secs 0.000 us 0.016 sy 1.703 es Wed May 16 12:16
-diff - root 1.641 secs 1.344 us 0.297 sy 1.672 es Wed May 16 12:16
-time - root 0.016 secs 0.000 us 0.016 sy 0.625 es Wed May 16 12:16
-dd - root 0.562 secs 0.000 us 0.562 sy 0.594 es Wed May 16 12:16
-time - root 0.016 secs 0.000 us 0.016 sy 3.047 es Wed May 16 12:16
-sleep - root 0.000 secs 0.000 us 0.000 sy 3.016 es Wed May 16 12:16
-time - root 0.016 secs 0.000 us 0.016 sy 17.219 es Wed May 16 12:16
-find - root 5.516 secs 0.562 us 4.953 sy 17.188 es Wed May 16 12:16
-time - root 0.016 secs 0.000 us 0.016 sy 30.031 es Wed May 16 12:15
-egrep - root 29.750 secs 29.688 us 0.062 sy 30.000 es Wed May 16 12:15
-time - root 0.016 secs 0.000 us 0.016 sy 1.688 es Wed May 16 12:15
-awk - root 1.609 secs 1.594 us 0.016 sy 1.641 es Wed May 16 12:15
-accton - root 0.016 secs 0.000 us 0.016 sy 0.031 es Wed May 16 12:15
diff --git a/usr.bin/lastcomm/tests/v2-sparc64-acct.in b/usr.bin/lastcomm/tests/v2-sparc64-acct.in
deleted file mode 100644
index 26df19e8b5e6..000000000000
Binary files a/usr.bin/lastcomm/tests/v2-sparc64-acct.in and /dev/null differ
diff --git a/usr.bin/lastcomm/tests/v2-sparc64.out b/usr.bin/lastcomm/tests/v2-sparc64.out
deleted file mode 100644
index f693e8efd9ff..000000000000
--- a/usr.bin/lastcomm/tests/v2-sparc64.out
+++ /dev/null
@@ -1,36 +0,0 @@
-core -FDX root 0.010 secs 0.000 us 0.010 sy 0.042 es Sat May 19 09:17
-core -DX root 0.037 secs 0.001 us 0.036 sy 0.055 es Sat May 19 09:17
-cc - root 0.033 secs 0.002 us 0.031 sy 1.012 es Sat May 19 09:17
-ld - root 0.186 secs 0.115 us 0.071 sy 0.361 es Sat May 19 09:17
-as - root 0.030 secs 0.005 us 0.025 sy 0.126 es Sat May 19 09:17
-cc1 - root 0.105 secs 0.048 us 0.057 sy 0.417 es Sat May 19 09:17
-time - root 0.029 secs 0.001 us 0.028 sy 0.047 es Sat May 19 09:17
-1234567890123456 - root 0.017 secs 0.003 us 0.014 sy 0.019 es Sat May 19 09:17
-ln - root 0.019 secs 0.003 us 0.016 sy 0.020 es Sat May 19 09:17
-time - root 0.029 secs 0.003 us 0.025 sy 0.047 es Sat May 19 09:17
-1234567890123456 - root 0.017 secs 0.002 us 0.015 sy 0.019 es Sat May 19 09:17
-ln - root 0.019 secs 0.004 us 0.015 sy 0.020 es Sat May 19 09:17
-time - root 0.029 secs 0.004 us 0.025 sy 0.053 es Sat May 19 09:17
-123456789012345 - root 0.018 secs 0.001 us 0.016 sy 0.025 es Sat May 19 09:17
-ln - root 0.020 secs 0.001 us 0.019 sy 0.020 es Sat May 19 09:17
-time - root 0.029 secs 0.003 us 0.026 sy 1.702 es Sat May 19 09:17
-diff - root 1.636 secs 1.337 us 0.299 sy 1.674 es Sat May 19 09:17
-time - root 0.027 secs 0.002 us 0.026 sy 0.634 es Sat May 19 09:17
-dd - root 0.588 secs 0.017 us 0.571 sy 0.605 es Sat May 19 09:17
-time - root 0.028 secs 0.001 us 0.027 sy 3.049 es Sat May 19 09:17
-sleep - root 0.018 secs 0.002 us 0.016 sy 3.021 es Sat May 19 09:17
-time - root 0.029 secs 0.002 us 0.027 sy 17.970 es Sat May 19 09:17
-find - root 5.703 secs 0.555 us 5.148 sy 17.942 es Sat May 19 09:17
-time - root 0.029 secs 0.005 us 0.024 sy 27.162 es Sat May 19 09:16
-egrep - root 26.715 secs 26.632 us 0.082 sy 27.133 es Sat May 19 09:16
-logger - root 0.023 secs 0.005 us 0.018 sy 60.808 es Sat May 19 09:15
-sh -F root 0.008 secs 0.000 us 0.008 sy 60.815 es Sat May 19 09:15
-fsck - root 0.055 secs 0.008 us 0.047 sy 60.806 es Sat May 19 09:15
-fsck_ufs - root 0.028 secs 0.005 us 0.022 sy 0.140 es Sat May 19 09:16
-fsck_ufs - root 0.028 secs 0.006 us 0.022 sy 0.123 es Sat May 19 09:16
-fsck_ufs - root 0.028 secs 0.004 us 0.024 sy 0.058 es Sat May 19 09:16
-fsck_ufs - root 0.032 secs 0.004 us 0.028 sy 0.326 es Sat May 19 09:16
-sleep - root 0.019 secs 0.001 us 0.018 sy 60.085 es Sat May 19 09:15
-time - root 0.029 secs 0.005 us 0.025 sy 1.701 es Sat May 19 09:16
-awk - root 1.644 secs 1.617 us 0.028 sy 1.657 es Sat May 19 09:16
-accton - root 0.019 secs 0.003 us 0.016 sy 0.027 es Sat May 19 09:16
diff --git a/usr.sbin/sa/tests/Makefile b/usr.sbin/sa/tests/Makefile
index 06fcd38a2769..ed2318417842 100644
--- a/usr.sbin/sa/tests/Makefile
+++ b/usr.sbin/sa/tests/Makefile
@@ -3,7 +3,7 @@
PACKAGE= tests
TAP_TESTS_SH= legacy_test
-TEST_METADATA.legacy_test+= allowed_architectures="amd64 i386 sparc64"
+TEST_METADATA.legacy_test+= allowed_architectures="amd64 i386"
${PACKAGE}FILES+= v1-amd64-sav.in
${PACKAGE}FILES+= v1-amd64-sav.out
@@ -15,19 +15,11 @@ ${PACKAGE}FILES+= v1-i386-sav.out
${PACKAGE}FILES+= v1-i386-u.out
${PACKAGE}FILES+= v1-i386-usr.in
${PACKAGE}FILES+= v1-i386-usr.out
-${PACKAGE}FILES+= v1-sparc64-sav.in
-${PACKAGE}FILES+= v1-sparc64-sav.out
-${PACKAGE}FILES+= v1-sparc64-u.out
-${PACKAGE}FILES+= v1-sparc64-usr.in
-${PACKAGE}FILES+= v1-sparc64-usr.out
${PACKAGE}FILES+= v2-amd64-sav.in
${PACKAGE}FILES+= v2-amd64-u.out
${PACKAGE}FILES+= v2-amd64-usr.in
${PACKAGE}FILES+= v2-i386-sav.in
${PACKAGE}FILES+= v2-i386-u.out
${PACKAGE}FILES+= v2-i386-usr.in
-${PACKAGE}FILES+= v2-sparc64-sav.in
-${PACKAGE}FILES+= v2-sparc64-u.out
-${PACKAGE}FILES+= v2-sparc64-usr.in
.include <bsd.test.mk>
diff --git a/usr.sbin/sa/tests/v1-sparc64-sav.in b/usr.sbin/sa/tests/v1-sparc64-sav.in
deleted file mode 100644
index d6911cf946bd..000000000000
Binary files a/usr.sbin/sa/tests/v1-sparc64-sav.in and /dev/null differ
diff --git a/usr.sbin/sa/tests/v1-sparc64-sav.out b/usr.sbin/sa/tests/v1-sparc64-sav.out
deleted file mode 100644
index 1905420793e4..000000000000
--- a/usr.sbin/sa/tests/v1-sparc64-sav.out
+++ /dev/null
@@ -1,5 +0,0 @@
- 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
deleted file mode 100644
index d0ecb51b9de7..000000000000
--- a/usr.sbin/sa/tests/v1-sparc64-u.out
+++ /dev/null
@@ -1,28 +0,0 @@
- 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
deleted file mode 100644
index 08d795b90dd4..000000000000
Binary files a/usr.sbin/sa/tests/v1-sparc64-usr.in and /dev/null differ
diff --git a/usr.sbin/sa/tests/v1-sparc64-usr.out b/usr.sbin/sa/tests/v1-sparc64-usr.out
deleted file mode 100644
index cab001f1b531..000000000000
--- a/usr.sbin/sa/tests/v1-sparc64-usr.out
+++ /dev/null
@@ -1 +0,0 @@
-root 28 0.66cpu 4508tio 9971k*sec
diff --git a/usr.sbin/sa/tests/v2-sparc64-sav.in b/usr.sbin/sa/tests/v2-sparc64-sav.in
deleted file mode 100644
index b6d836a59e06..000000000000
Binary files a/usr.sbin/sa/tests/v2-sparc64-sav.in and /dev/null differ
diff --git a/usr.sbin/sa/tests/v2-sparc64-u.out b/usr.sbin/sa/tests/v2-sparc64-u.out
deleted file mode 100644
index 9339238ef449..000000000000
--- a/usr.sbin/sa/tests/v2-sparc64-u.out
+++ /dev/null
@@ -1,36 +0,0 @@
- 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
deleted file mode 100644
index 01a1bdc04333..000000000000
Binary files a/usr.sbin/sa/tests/v2-sparc64-usr.in and /dev/null differ