From df5d3646902fd384b27d11dabbe23499b0d7ccc1 Mon Sep 17 00:00:00 2001 From: ngie Date: Thu, 30 Mar 2017 06:20:58 +0000 Subject: [PATCH] MFC r315776: Rename tests from to _test to match the FreeBSD test suite naming scheme usr.bin/diff/diff_test was renamed to usr.bin/diff/netbsd_diff_test to avoid collisions with the renamed FreeBSD test. git-svn-id: svn://svn.freebsd.org/base/stable/10@316257 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- ObsoleteFiles.inc | 12 +++++++++++ usr.bin/col/tests/Makefile | 2 +- usr.bin/col/tests/{col.sh => col_test.sh} | 0 usr.sbin/pw/tests/Makefile | 20 +++++++++---------- .../tests/{pw_config.sh => pw_config_test.sh} | 0 .../tests/{pw_etcdir.sh => pw_etcdir_test.sh} | 0 .../{pw_groupadd.sh => pw_groupadd_test.sh} | 0 .../{pw_groupdel.sh => pw_groupdel_test.sh} | 0 .../{pw_groupmod.sh => pw_groupmod_test.sh} | 0 .../pw/tests/{pw_lock.sh => pw_lock_test.sh} | 0 .../{pw_useradd.sh => pw_useradd_test.sh} | 0 .../{pw_userdel.sh => pw_userdel_test.sh} | 0 .../{pw_usermod.sh => pw_usermod_test.sh} | 0 .../{pw_usernext.sh => pw_usernext_test.sh} | 0 14 files changed, 23 insertions(+), 11 deletions(-) rename usr.bin/col/tests/{col.sh => col_test.sh} (100%) rename usr.sbin/pw/tests/{pw_config.sh => pw_config_test.sh} (100%) rename usr.sbin/pw/tests/{pw_etcdir.sh => pw_etcdir_test.sh} (100%) rename usr.sbin/pw/tests/{pw_groupadd.sh => pw_groupadd_test.sh} (100%) rename usr.sbin/pw/tests/{pw_groupdel.sh => pw_groupdel_test.sh} (100%) rename usr.sbin/pw/tests/{pw_groupmod.sh => pw_groupmod_test.sh} (100%) rename usr.sbin/pw/tests/{pw_lock.sh => pw_lock_test.sh} (100%) rename usr.sbin/pw/tests/{pw_useradd.sh => pw_useradd_test.sh} (100%) rename usr.sbin/pw/tests/{pw_userdel.sh => pw_userdel_test.sh} (100%) rename usr.sbin/pw/tests/{pw_usermod.sh => pw_usermod_test.sh} (100%) rename usr.sbin/pw/tests/{pw_usernext.sh => pw_usernext_test.sh} (100%) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index addb51870..ed3143c47 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,18 @@ # xargs -n1 | sort | uniq -d; # done +# 20170322: rename to _test to match the FreeBSD test suite name scheme +OLD_FILES+=usr/tests/usr.bin/col/col +OLD_FILES+=usr/tests/usr.sbin/pw/pw_config_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_etcdir_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_lock_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupadd_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupdel_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupmod_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_useradd_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_userdel_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_usermod_test +OLD_FILES+=usr/tests/usr.sbin/pw/pw_usernext_test # 20170214: Four files from ggate tests consolidated into one OLD_FILES+=usr/tests/sys/geom/class/gate/1_test OLD_FILES+=usr/tests/sys/geom/class/gate/2_test diff --git a/usr.bin/col/tests/Makefile b/usr.bin/col/tests/Makefile index cf02083d7..aa437bf6d 100644 --- a/usr.bin/col/tests/Makefile +++ b/usr.bin/col/tests/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -ATF_TESTS_SH= col +ATF_TESTS_SH= col_test FILES= rlf.in \ rlf2.in diff --git a/usr.bin/col/tests/col.sh b/usr.bin/col/tests/col_test.sh similarity index 100% rename from usr.bin/col/tests/col.sh rename to usr.bin/col/tests/col_test.sh diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile index 613d8b540..1033282f3 100644 --- a/usr.sbin/pw/tests/Makefile +++ b/usr.sbin/pw/tests/Makefile @@ -5,16 +5,16 @@ BINDIR= ${TESTSDIR} PROGS+= crypt LDADD+= -lcrypt -ATF_TESTS_SH= pw_etcdir \ - pw_lock \ - pw_config \ - pw_groupadd \ - pw_groupdel \ - pw_groupmod \ - pw_useradd \ - pw_userdel \ - pw_usermod \ - pw_usernext +ATF_TESTS_SH= pw_etcdir_test \ + pw_lock_test \ + pw_config_test \ + pw_groupadd_test \ + pw_groupdel_test \ + pw_groupmod_test \ + pw_useradd_test \ + pw_userdel_test \ + pw_usermod_test \ + pw_usernext_test .for tp in ${ATF_TESTS_SH} TEST_METADATA.${tp}+= required_user="root" diff --git a/usr.sbin/pw/tests/pw_config.sh b/usr.sbin/pw/tests/pw_config_test.sh similarity index 100% rename from usr.sbin/pw/tests/pw_config.sh rename to usr.sbin/pw/tests/pw_config_test.sh diff --git a/usr.sbin/pw/tests/pw_etcdir.sh b/usr.sbin/pw/tests/pw_etcdir_test.sh similarity index 100% rename from usr.sbin/pw/tests/pw_etcdir.sh rename to usr.sbin/pw/tests/pw_etcdir_test.sh diff --git a/usr.sbin/pw/tests/pw_groupadd.sh b/usr.sbin/pw/tests/pw_groupadd_test.sh similarity index 100% rename from usr.sbin/pw/tests/pw_groupadd.sh rename to usr.sbin/pw/tests/pw_groupadd_test.sh diff --git a/usr.sbin/pw/tests/pw_groupdel.sh b/usr.sbin/pw/tests/pw_groupdel_test.sh similarity index 100% rename from usr.sbin/pw/tests/pw_groupdel.sh rename to usr.sbin/pw/tests/pw_groupdel_test.sh diff --git a/usr.sbin/pw/tests/pw_groupmod.sh b/usr.sbin/pw/tests/pw_groupmod_test.sh similarity index 100% rename from usr.sbin/pw/tests/pw_groupmod.sh rename to usr.sbin/pw/tests/pw_groupmod_test.sh diff --git a/usr.sbin/pw/tests/pw_lock.sh b/usr.sbin/pw/tests/pw_lock_test.sh similarity index 100% rename from usr.sbin/pw/tests/pw_lock.sh rename to usr.sbin/pw/tests/pw_lock_test.sh diff --git a/usr.sbin/pw/tests/pw_useradd.sh b/usr.sbin/pw/tests/pw_useradd_test.sh similarity index 100% rename from usr.sbin/pw/tests/pw_useradd.sh rename to usr.sbin/pw/tests/pw_useradd_test.sh diff --git a/usr.sbin/pw/tests/pw_userdel.sh b/usr.sbin/pw/tests/pw_userdel_test.sh similarity index 100% rename from usr.sbin/pw/tests/pw_userdel.sh rename to usr.sbin/pw/tests/pw_userdel_test.sh diff --git a/usr.sbin/pw/tests/pw_usermod.sh b/usr.sbin/pw/tests/pw_usermod_test.sh similarity index 100% rename from usr.sbin/pw/tests/pw_usermod.sh rename to usr.sbin/pw/tests/pw_usermod_test.sh diff --git a/usr.sbin/pw/tests/pw_usernext.sh b/usr.sbin/pw/tests/pw_usernext_test.sh similarity index 100% rename from usr.sbin/pw/tests/pw_usernext.sh rename to usr.sbin/pw/tests/pw_usernext_test.sh -- 2.45.0