Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Jul 2022 20:04:42 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: a985fad6e054 - main - depend-cleanup.sh: Handle kqtest being renamed to kqueue_test.
Message-ID:  <202207142004.26EK4gfd074784@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb:

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

commit a985fad6e054cd66331956a8dbb20506c55189e5
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-07-14 20:03:59 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207142004.26EK4gfd074784>