From 5544ab48b35733677c4fb09efadb9252d2cb8b93 Mon Sep 17 00:00:00 2001 From: Christopher Dryden Date: Mon, 15 Dec 2025 21:51:23 +0000 Subject: [PATCH] fix: patch inotify-dir-recreate test for notify crate's threaded inotify --- util/build-gnu.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 626400d6a57..463ad37c9e1 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -223,6 +223,12 @@ sed -i -e "s|---dis ||g" tests/tail/overlay-headers.sh # Do not FAIL, just do a regular ERROR "${SED}" -i -e "s|framework_failure_ 'no inotify_add_watch';|fail=1;|" tests/tail/inotify-rotate-resources.sh +# The notify crate makes inotify_add_watch calls in a background thread, so strace needs -f to follow threads. +# Also remove the HAVE_INOTIFY header check since that's for C builds. +"${SED}" -i -e "s|grep '^#define HAVE_INOTIFY 1' \"\$CONFIG_HEADER\" >/dev/null && is_local_dir_ \. |is_local_dir_ . |" \ + -e "s|strace -e inotify_add_watch|strace -f -e inotify_add_watch|" \ + tests/tail/inotify-dir-recreate.sh + test -f "${UU_BUILD_DIR}/getlimits" || cp src/getlimits "${UU_BUILD_DIR}" # pr produces very long log and this command isn't super interesting