From nobody Mon Mar 20 19:56:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgQVP00NFz408tg; Mon, 20 Mar 2023 19:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PgQVN6X8dz3C87; Mon, 20 Mar 2023 19:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679342204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7jmeWLAa5PGOGaYOezNipd+VHeHHzlFxh1r19Qr/7Tk=; b=F3+AkSZuUxp0A/ae6x3okDOkzPoPC6n1at8K1lb/Q64Y07dCrut0GZyOtWmCppbDJvTI85 CyYSpdMbj7qgNBX2QsvN7EqcdUtGuzEGoazgAFtfZbsmwkxPUtHJ2dQWLPOEaRHmre3kQs 1erycnEI2pPE+CVcAo9q8m0yYmKQR4LePNgWExQPcKwNs7EYfZLi6JdmXqu4nFj/3mBNk7 l4s8ifK3wrGHPTMOagfzu5DJZ9PYFX3Gf5zLMeixokxj+Wg5y9/v+MuLdxqYG5mYENSgHP E+FTLv2IeyWKEJZfwIGn/bk+SvhrVBd/OVh7H83Uy14VME73zDyNcJWna6+hSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679342204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7jmeWLAa5PGOGaYOezNipd+VHeHHzlFxh1r19Qr/7Tk=; b=riOVmvFQw7PUtH8mTZJJadxicqRip/p0jxPDpNZYDEwe5GPcolXY09A1nCFRAOywOeXRqf 73lxqRd0VTLOQU79+4Ofs/UlZ9WwA69VS2jZCjwfJ3RPa6NgepkwY53odNnABSC8u7cNET r4fnQYM7rtp4UPhZ7L3P9xy2tBrZXe+qR1JQlYGvPPzJfWAjFpqm99jAbxHSDWzXy73/uh T4OhWPZKL8369Al4pAoo55akjsNvAH93jVZWgU5pPMf/u30I7y1TFmDdQdtarpzfH1VgaB 2/eHIE4WAj79YL04o4ngj2AbdN/zpHTgK14rzQDrJCDg0rfRMtRYSczaevB5+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679342204; a=rsa-sha256; cv=none; b=j842oW+TFzwaIv5BpymKaSdxQZEPcmcdP/vRXkoWgCkWVPb1jnpBA7quRX9CTJcxm7Z8fW 27Sj9043aiAC7YMcB18Yb8vYP9apHm5/RqKNvCIGnUqMOS11VNAuXpf674vI6H2f4+8998 j4mBbt3Yjkt/Lno7QMkVdLxSG87djTG1xotDQfIFcSR9G5g7Uk139iN1nfqCmkkZhsib/h vLVPxe8yNW7G73ZZpDsIUb0OqTuT3+FyXJ11yh/x1ZbNF9PwgKB1cvv44Oi4myAMmJlEPN KOw2HKfHw7L3CoyC25o10zvt5+gaKP/jm0IgaglRmyNiUeJ5jnzkWbYTAxUZDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgQVN5ZHmzj2d; Mon, 20 Mar 2023 19:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KJuiJu099232; Mon, 20 Mar 2023 19:56:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KJuisn099231; Mon, 20 Mar 2023 19:56:44 GMT (envelope-from git) Date: Mon, 20 Mar 2023 19:56:44 GMT Message-Id: <202303201956.32KJuisn099231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 822057bfbbbc - main - pkill: tests: do a pass for case-sensitive conflicts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 822057bfbbbcdb722a7ccd0e40d6b7e82b1d83f7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=822057bfbbbcdb722a7ccd0e40d6b7e82b1d83f7 commit 822057bfbbbcdb722a7ccd0e40d6b7e82b1d83f7 Author: Kyle Evans AuthorDate: 2023-03-20 19:51:41 +0000 Commit: Kyle Evans CommitDate: 2023-03-20 19:54:54 +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. Sponsored by: Klara, Inc. --- 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(-) 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 similarity index 100% rename from bin/pkill/tests/pgrep-F_test.sh rename to 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 similarity index 100% rename from bin/pkill/tests/pgrep-LF_test.sh rename to 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 similarity index 100% rename from bin/pkill/tests/pgrep-P_test.sh rename to 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 similarity index 100% rename from bin/pkill/tests/pgrep-U_test.sh rename to 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 similarity index 100% rename from bin/pkill/tests/pkill-F_test.sh rename to 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 similarity index 100% rename from bin/pkill/tests/pkill-LF_test.sh rename to 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 similarity index 100% rename from bin/pkill/tests/pkill-P_test.sh rename to 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 similarity index 100% rename from bin/pkill/tests/pkill-U_test.sh rename to bin/pkill/tests/pkill-_u_test.sh