diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2023-03-20 19:51:41 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2023-03-20 19:54:54 +0000 |
| commit | 822057bfbbbcdb722a7ccd0e40d6b7e82b1d83f7 (patch) | |
| tree | 297da5310c4754ee9fb2ca3fdea4a87b5de4bece | |
| parent | 3610bffd2888b65389a46e8d075ce8e1fc83af4c (diff) | |
| download | src-822057bfbbbcdb722a7ccd0e40d6b7e82b1d83f7.tar.gz src-822057bfbbbcdb722a7ccd0e40d6b7e82b1d83f7.zip | |
pkill: tests: do a pass for case-sensitive conflicts
As in 76b6a59f9d30a5a39a5ed, encode upper-case flag tests with a leading
underbar to avoid collisions (thus, erroneously dirty git repos) on
case-sensitive filesystems.
Sponsored by: Klara, Inc.
| -rw-r--r-- | ObsoleteFiles.inc | 10 | ||||
| -rw-r--r-- | bin/pkill/tests/Makefile | 16 | ||||
| -rw-r--r-- | bin/pkill/tests/pgrep-_f_test.sh (renamed from bin/pkill/tests/pgrep-F_test.sh) | 0 | ||||
| -rw-r--r-- | bin/pkill/tests/pgrep-_lf_test.sh (renamed from bin/pkill/tests/pgrep-LF_test.sh) | 0 | ||||
| -rw-r--r-- | bin/pkill/tests/pgrep-_p_test.sh (renamed from bin/pkill/tests/pgrep-P_test.sh) | 0 | ||||
| -rw-r--r-- | bin/pkill/tests/pgrep-_u_test.sh (renamed from bin/pkill/tests/pgrep-U_test.sh) | 0 | ||||
| -rw-r--r-- | bin/pkill/tests/pkill-_f_test.sh (renamed from bin/pkill/tests/pkill-F_test.sh) | 0 | ||||
| -rw-r--r-- | bin/pkill/tests/pkill-_lf_test.sh (renamed from bin/pkill/tests/pkill-LF_test.sh) | 0 | ||||
| -rw-r--r-- | bin/pkill/tests/pkill-_p_test.sh (renamed from bin/pkill/tests/pkill-P_test.sh) | 0 | ||||
| -rw-r--r-- | bin/pkill/tests/pkill-_u_test.sh (renamed from bin/pkill/tests/pkill-U_test.sh) | 0 |
10 files changed, 18 insertions, 8 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 2f71a267e627..2492bf4731ee 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,16 @@ # xargs -n1 | sort | uniq -d; # done +# 20230320: case-sensitive conflicts removed +OLD_FILES+=usr/tests/bin/pkill/pgrep-F_test +OLD_FILES+=usr/tests/bin/pkill/pgrep-LF_test +OLD_FILES+=usr/tests/bin/pkill/pgrep-P_test +OLD_FILES+=usr/tests/bin/pkill/pgrep-U_test +OLD_FILES+=usr/tests/bin/pkill/pkill-F_test +OLD_FILES+=usr/tests/bin/pkill/pkill-LF_test +OLD_FILES+=usr/tests/bin/pkill/pkill-P_test +OLD_FILES+=usr/tests/bin/pkill/pkill-U_test + # 20230309: remove remaining ATM support OLD_FILES+=usr/bin/sscop OLD_FILES+=usr/include/netnatm/addr.h diff --git a/bin/pkill/tests/Makefile b/bin/pkill/tests/Makefile index 9bf448bb2460..66a1d655b764 100644 --- a/bin/pkill/tests/Makefile +++ b/bin/pkill/tests/Makefile @@ -7,10 +7,10 @@ PACKAGE= tests PROGS+= spin_helper BINDIR= ${TESTSDIR} -TAP_TESTS_SH= pgrep-F_test -TAP_TESTS_SH+= pgrep-LF_test -TAP_TESTS_SH+= pgrep-P_test -TAP_TESTS_SH+= pgrep-U_test +TAP_TESTS_SH= pgrep-_f_test +TAP_TESTS_SH+= pgrep-_lf_test +TAP_TESTS_SH+= pgrep-_p_test +TAP_TESTS_SH+= pgrep-_u_test TAP_TESTS_SH+= pgrep-_g_test TAP_TESTS_SH+= pgrep-_s_test TAP_TESTS_SH+= pgrep-g_test @@ -27,10 +27,10 @@ TAP_TESTS_SH+= pgrep-s_test TAP_TESTS_SH+= pgrep-t_test TAP_TESTS_SH+= pgrep-v_test TAP_TESTS_SH+= pgrep-x_test -TAP_TESTS_SH+= pkill-F_test -TAP_TESTS_SH+= pkill-LF_test -TAP_TESTS_SH+= pkill-P_test -TAP_TESTS_SH+= pkill-U_test +TAP_TESTS_SH+= pkill-_f_test +TAP_TESTS_SH+= pkill-_lf_test +TAP_TESTS_SH+= pkill-_p_test +TAP_TESTS_SH+= pkill-_u_test TAP_TESTS_SH+= pkill-_g_test TAP_TESTS_SH+= pkill-g_test TAP_TESTS_SH+= pkill-i_test diff --git a/bin/pkill/tests/pgrep-F_test.sh b/bin/pkill/tests/pgrep-_f_test.sh index 4d8feaa34eb2..4d8feaa34eb2 100644 --- a/bin/pkill/tests/pgrep-F_test.sh +++ b/bin/pkill/tests/pgrep-_f_test.sh diff --git a/bin/pkill/tests/pgrep-LF_test.sh b/bin/pkill/tests/pgrep-_lf_test.sh index 4818869d8d6e..4818869d8d6e 100644 --- a/bin/pkill/tests/pgrep-LF_test.sh +++ b/bin/pkill/tests/pgrep-_lf_test.sh diff --git a/bin/pkill/tests/pgrep-P_test.sh b/bin/pkill/tests/pgrep-_p_test.sh index 5a5cdcf8e97c..5a5cdcf8e97c 100644 --- a/bin/pkill/tests/pgrep-P_test.sh +++ b/bin/pkill/tests/pgrep-_p_test.sh diff --git a/bin/pkill/tests/pgrep-U_test.sh b/bin/pkill/tests/pgrep-_u_test.sh index 2e7f24d94659..2e7f24d94659 100644 --- a/bin/pkill/tests/pgrep-U_test.sh +++ b/bin/pkill/tests/pgrep-_u_test.sh diff --git a/bin/pkill/tests/pkill-F_test.sh b/bin/pkill/tests/pkill-_f_test.sh index 48ad47456839..48ad47456839 100644 --- a/bin/pkill/tests/pkill-F_test.sh +++ b/bin/pkill/tests/pkill-_f_test.sh diff --git a/bin/pkill/tests/pkill-LF_test.sh b/bin/pkill/tests/pkill-_lf_test.sh index fcafd0a1ee2a..fcafd0a1ee2a 100644 --- a/bin/pkill/tests/pkill-LF_test.sh +++ b/bin/pkill/tests/pkill-_lf_test.sh diff --git a/bin/pkill/tests/pkill-P_test.sh b/bin/pkill/tests/pkill-_p_test.sh index 2030710af659..2030710af659 100644 --- a/bin/pkill/tests/pkill-P_test.sh +++ b/bin/pkill/tests/pkill-_p_test.sh diff --git a/bin/pkill/tests/pkill-U_test.sh b/bin/pkill/tests/pkill-_u_test.sh index 04395e559387..04395e559387 100644 --- a/bin/pkill/tests/pkill-U_test.sh +++ b/bin/pkill/tests/pkill-_u_test.sh |