Date: Thu, 10 Nov 2022 23:17:08 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 72845ee316ec - stable/13 - depend-cleanup.sh: Handle kqtest being renamed to kqueue_test. Message-ID: <202211102317.2AANH87r043423@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=72845ee316ec7e7976f2244cd0886071bb74d92e commit 72845ee316ec7e7976f2244cd0886071bb74d92e Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-07-14 20:03:59 +0000 Commit: John Baldwin <jhb@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211102317.2AANH87r043423>