Bug 270948

Summary:	Conflict with bin/pkill/tests/pgrep-F_test.sh / bin/pkill/tests/pgrep-f_test.sh
Product:	Base System	Reporter:	jhellenthal
Component:	bin	Assignee:	Kyle Evans <kevans>
Status:	Closed FIXED
Severity:	Affects Some People	CC:	bugs, emaste, freebsd, jhellenthal, kevans
Priority:	---	Flags:	kevans: mfc-stable13+ kevans: mfc-stable12-
Version:	Unspecified
Hardware:	amd64
OS:	Any

Description jhellenthal 2023-04-20 13:03:03 UTC

bin/pkill/tests/pgrep-F_test.sh & bin/pkill/tests/pgrep-f_test.sh tests on case-insensitive filesystems (macOS/APFS default) stops the repository from updating properly.

Please rename to more compliant with both case-insensitive and sensitive filesystems....

src/bin/pkill/tests/pgrep-F_test.sh conflicts with src/bin/pkill/tests/pgrep-f_test.sh

pgrep-F… → pgrep-Pidfile_test.sh ; and pgrep-f… → pgrep-full_test.sh

Thanks

Comment 1 Kyle Evans freebsd_committer

2023-04-20 17:26:45 UTC

I guess I'll take it- I did a de-conflicting pass actually just a month ago: https://cgit.freebsd.org/src/commit/?id=822057bfbbbcdb7

I can MFC that.

Comment 2 Kyle Evans freebsd_committer

2023-04-20 17:30:35 UTC

Thanks for the report!

Comment 3 commit-hook freebsd_committer

2023-04-20 17:30:45 UTC

A commit in branch stable/13 references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=312c06634ec3b405377840573f932fd937f51a61

commit 312c06634ec3b405377840573f932fd937f51a61
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2023-03-20 19:51:41 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2023-04-20 17:29:23 +0000

    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.

    PR:             270948
    Sponsored by:   Klara, Inc.

    (cherry picked from commit 822057bfbbbcdb722a7ccd0e40d6b7e82b1d83f7)

 ObsoleteFiles.inc                                       | 10 ++++++++++
 bin/pkill/tests/Makefile                                | 16 ++++++++--------
 bin/pkill/tests/{pgrep-F_test.sh => pgrep-_f_test.sh}   |  0
 bin/pkill/tests/{pgrep-LF_test.sh => pgrep-_lf_test.sh} |  0
 bin/pkill/tests/{pgrep-P_test.sh => pgrep-_p_test.sh}   |  0
 bin/pkill/tests/{pgrep-U_test.sh => pgrep-_u_test.sh}   |  0
 bin/pkill/tests/{pkill-F_test.sh => pkill-_f_test.sh}   |  0
 bin/pkill/tests/{pkill-LF_test.sh => pkill-_lf_test.sh} |  0
 bin/pkill/tests/{pkill-P_test.sh => pkill-_p_test.sh}   |  0
 bin/pkill/tests/{pkill-U_test.sh => pkill-_u_test.sh}   |  0
 10 files changed, 18 insertions(+), 8 deletions(-)