From nobody Thu Nov 10 23:17:08 2022 X-Original-To: dev-commits-src-all@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 4N7d5c4RM6z4dL1w; Thu, 10 Nov 2022 23:17:08 +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 4N7d5c3vYgz4TrC; Thu, 10 Nov 2022 23:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668122228; 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=Lq6c32j4B2MFEBrpnjEDZ0Yr94/ixszrT7fHpgrqJwU=; b=szFqDVNiFNraxBUcODbIPkN0q9kWNyKUjFMZQ+VUIwq1u+19GWuo4QdW0MscpskH2TsYDj 9rDpaoLHkhNsbMf/PQgfsEMR3SlZtLUgK4d0XbXSWw2bfAjs2nzpSAJR1PnviXbzMJJD2x daYjHAhe+n5/6G7pwvBds04yb7i322OUfo3ToGLd1CCrAnYBrHFUySaZojejrVWmUi1d/h mcKDbOnUsvgMoZupogppKmsCxpVfNfNpdZG340eJmT+mY5tBH+Z8+52pkgfyS0ndCnTdKc 8vNO0fViho5T5HADPkvyLI4VkNQ9ReyBdlw0UWc+Sz53irhJKzKFipDSZIagtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668122228; 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=Lq6c32j4B2MFEBrpnjEDZ0Yr94/ixszrT7fHpgrqJwU=; b=V2gJf3/xs/lcBrIO/mxp7btYUVBpmGojMrId18RtD4RqNA5fivs+VIsYjWpwIOw/L15PA/ o5xbEGAb1TcjB2pZnmhGqSaRNq/olyL7ueDiDlip2eOr8RLZ5UVqDBWwgG36kG3MLIbfTm FHPEKGRkp4iT9RjUh/Gb+M+jksOsqoJIgY2KxoVOdoPnbAkcLfmT0JbpXVijmsrrNqTdjI 5FBIZvuV3eagG8bHUSjZIggfWR3biaVNtVEOkNgNjnY6eVdH8V4l0dWujpYyeD52ueHbiX ar8v7tBRMkP//DDcPQuK++5XbruDCelW3oKjlR34B8YLBeEf79PWrH4ZlJ72fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668122228; a=rsa-sha256; cv=none; b=HGLcLRzFGSpaYPzD8gX9T6ZO6E9GSgfr0tjOUzU/kUsBOtl+oxM7eQYrC7EejTi7CSdYDQ haYF2uZIHqjP2BIYQSYBg0AeILZDw+prykAGB8VxX0CuDvBh3ZHjnPi+YdkVN8Se9OtW9/ 1SQbcypaCfhNeDOWEhSXd2pkbcjXp34TCbnNGOB91XC1IG12BkzoC43JMs1qwP18W5sFQ1 G6U8aOYpLxnTzSRbs4+RH+hpIIppEY8hWRkB41VR2Sma3/gwXKMgFrtrELX33HiFloYdGB AkGwra1V0BewP5f+D29Bmk/xF+awk9d6uogHyYPEsAqRAnWzcEBGVGlSxO9D7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N7d5c2s7FzKfH; Thu, 10 Nov 2022 23:17:08 +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 2AANH8q9043425; Thu, 10 Nov 2022 23:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AANH87r043423; Thu, 10 Nov 2022 23:17:08 GMT (envelope-from git) Date: Thu, 10 Nov 2022 23:17:08 GMT Message-Id: <202211102317.2AANH87r043423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 72845ee316ec - stable/13 - depend-cleanup.sh: Handle kqtest being renamed to kqueue_test. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 72845ee316ec7e7976f2244cd0886071bb74d92e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=72845ee316ec7e7976f2244cd0886071bb74d92e commit 72845ee316ec7e7976f2244cd0886071bb74d92e Author: John Baldwin AuthorDate: 2022-07-14 20:03:59 +0000 Commit: John Baldwin CommitDate: 2022-11-10 23:16:58 +0000 depend-cleanup.sh: Handle kqtest being renamed to kqueue_test. bmake will not think that object files such as read.o are out of date due to common.h changing since the dependency is only recorded in .depend.kqtest.read.o in an old object directory. Reviewed by: markj Fixes: 68fe988a40ca kqueue tests: Simplify the test runner Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D35820 (cherry picked from commit a985fad6e054cd66331956a8dbb20506c55189e5) --- tools/build/depend-cleanup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index b6ad7701c32b..24e31994507d 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -78,3 +78,11 @@ fi clean_dep cddl/lib/libspl atomic S # 20211207 cbdec8db18b5 switch to libthr-friendly pdfork clean_dep lib/libc pdfork S + +# 20220524 68fe988a40ca kqueue_test binary replaced shell script +if stat "$OBJTOP"/tests/sys/kqueue/libkqueue/*kqtest* \ + "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.kqtest* >/dev/null 2>&1; then + echo "Removing old kqtest" + rm -f "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.* \ + "$OBJTOP"/tests/sys/kqueue/libkqueue/* +fi