From nobody Thu Jul 14 20:04:42 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 4LkQSV6816z4T3FX; Thu, 14 Jul 2022 20:04:42 +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 4LkQSV5gdBz3R5f; Thu, 14 Jul 2022 20:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657829082; 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=Po+s85HTIkK5q5CnfCPMW76fWqVR1uRoZSG4COcaLIM=; b=HbmbHqluyHiPpG0HXCgD525OZ7RkU8cD7bGdA5TlyN3AkLgwwVw9mlbZyRwbdC9queKw3U ixy0nFRrblVNzPewiDl1JjvzcQ6lyKJurKPb4wjinQ8rxXmpCtgbPb44+9EOOO+Tb9ZgYH qMvG2GlpfcUDdx09j9WH5dEbNjEzDjhNISPI2piiklcR3mb0b1irg4gU+JPjP4QGRpBSNK buA5v9QxbbpN5WBG5BvsdpR73hC7yy1DLNxxBPerzG1sHdjSjPOHniQTBScs5RkADjjsQi FG/mX329/IA/O2jca/mIQF/OpvRe+foFs7xt22f8p3SIxH6pDjOEAGtghh3dhQ== 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 4LkQSV4nr8zFwj; Thu, 14 Jul 2022 20:04:42 +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 26EK4gPB074785; Thu, 14 Jul 2022 20:04:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26EK4gfd074784; Thu, 14 Jul 2022 20:04:42 GMT (envelope-from git) Date: Thu, 14 Jul 2022 20:04:42 GMT Message-Id: <202207142004.26EK4gfd074784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a985fad6e054 - main - 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/main X-Git-Reftype: branch X-Git-Commit: a985fad6e054cd66331956a8dbb20506c55189e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657829082; 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=Po+s85HTIkK5q5CnfCPMW76fWqVR1uRoZSG4COcaLIM=; b=m+AKnicZchirvBI+7ExkH3GbiLPLiQrahEP8zp9c4DY+52XVxVLSaw9R+WD/ev9+qCYBRL qFTh9SbRT6dLMRzw4p9mxRVqDRiDpgcfd3cQ8Q1WjTNDi7m+wLrxxGbz1wCpUx52hYFu96 Yl8pJsmjQP00EdVkc9tJOjkAIxbMc208I909+IhbqznFFYtWTPASfB5wUC51qTAtPSsP14 PeutI/Yh8aNPxKHfqwSFMsz2pOXJ4siU6+DJoQPyD9xKnU9UI9sdPB8qFbfua8cX3H6Qmb Omc7zIIA5s7TyewK5J3Jq6W00Yj5u0t9LUKnnpNm+fd84SS6YgU7XrSgcAvRTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657829082; a=rsa-sha256; cv=none; b=SUPRgijjWtQLugnjv3RX5KQYclmGGKBrRq59eRCyYr56eAh2j5SwXyCs5Ei42ODK5OT3Lo mAKnEAkHlRNN5hVBvWTzl99ohIQaJ4Tm+3cICYV37cnhx5Do2WvbGU7Ihhck30TRhTYi5k rCTkWbdXVhKlaZFUYceANHomG9kLhYHH8bCAjq9QY74JmofHuC6TnZnFX8gMNKA0Fj47Qm /xlW9jXz3QnmilsQtyUNUUz1DD9ficJbQBtug2UjxCG+JZyxVlmMtK348XDdEjt9D8dcLR R1I4pAeK7j9GNkwrfF4yk9kloUABrrOtkCVmhEU2FgBxFlIhMT7KTrcdWNXD9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a985fad6e054cd66331956a8dbb20506c55189e5 commit a985fad6e054cd66331956a8dbb20506c55189e5 Author: John Baldwin AuthorDate: 2022-07-14 20:03:59 +0000 Commit: John Baldwin CommitDate: 2022-07-14 20:03:59 +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 --- 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 39b06b45d45f..35066ee7f921 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -90,3 +90,11 @@ fi if [ "$MACHINE_ARCH" = "amd64" ]; then clean_dep lib/libc bcmp c fi + +# 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