* [PATCH] test/fsnotify: Skip fsnotify test if sys/fanotify.h not available
@ 2023-02-14 16:46 Alviro Iskandar Setiawan
2023-02-14 16:49 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Alviro Iskandar Setiawan @ 2023-02-14 16:46 UTC (permalink / raw)
To: Jens Axboe
Cc: io-uring Mailing List, GNU/Weeb Mailing List,
Alviro Iskandar Setiawan, Dwiky Rizky Ananditya
Fix build on Termux (Android). Most android devices don't have
<sys/fanotify.h> on Termux. Skip the test if it's not available.
Reported-by: Dwiky Rizky Ananditya <[email protected]>
Tested-by: Dwiky Rizky Ananditya <[email protected]>
Signed-off-by: Alviro Iskandar Setiawan <[email protected]>
---
configure | 19 +++++++++++++++++++
test/fsnotify.c | 13 ++++++++++++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index e9b7f882f0707e64..28f3eb0aee24f9ea 100755
--- a/configure
+++ b/configure
@@ -419,6 +419,22 @@ fi
print_config "nolibc support" "$liburing_nolibc";
#############################################################################
+####################################################
+# Most Android devices don't have sys/fanotify.h
+has_fanotify="no"
+cat > $TMPC << EOF
+#include <sys/fanotify.h>
+int main(void)
+{
+ return 0;
+}
+EOF
+if compile_prog "" "" "fanotify"; then
+ has_fanotify="yes"
+fi
+print_config "has_fanotify" "$has_fanotify"
+####################################################
+
if test "$liburing_nolibc" = "yes"; then
output_sym "CONFIG_NOLIBC"
fi
@@ -452,6 +468,9 @@ fi
if test "$nvme_uring_cmd" = "yes"; then
output_sym "CONFIG_HAVE_NVME_URING"
fi
+if test "$has_fanotify" = "yes"; then
+ output_sym "CONFIG_HAVE_FANOTIFY"
+fi
echo "CC=$cc" >> $config_host_mak
print_config "CC" "$cc"
diff --git a/test/fsnotify.c b/test/fsnotify.c
index b9b6926ced937c5f..d672f2cc2c3ff27c 100644
--- a/test/fsnotify.c
+++ b/test/fsnotify.c
@@ -2,6 +2,10 @@
/*
* Description: test fsnotify access off O_DIRECT read
*/
+
+#include "helpers.h"
+
+#ifdef CONFIG_HAVE_FANOTIFY
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -11,7 +15,6 @@
#include <sys/wait.h>
#include "liburing.h"
-#include "helpers.h"
int main(int argc, char *argv[])
{
@@ -99,3 +102,11 @@ out:
unlink(fname);
return err;
}
+
+#else /* #ifdef CONFIG_HAVE_FANOTIFY */
+
+int main(void)
+{
+ return T_EXIT_SKIP;
+}
+#endif /* #ifdef CONFIG_HAVE_FANOTIFY */
--
Alviro Iskandar Setiawan
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] test/fsnotify: Skip fsnotify test if sys/fanotify.h not available
2023-02-14 16:46 [PATCH] test/fsnotify: Skip fsnotify test if sys/fanotify.h not available Alviro Iskandar Setiawan
@ 2023-02-14 16:49 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2023-02-14 16:49 UTC (permalink / raw)
To: Alviro Iskandar Setiawan
Cc: io-uring Mailing List, GNU/Weeb Mailing List,
Dwiky Rizky Ananditya
On Tue, 14 Feb 2023 16:46:13 +0000, Alviro Iskandar Setiawan wrote:
> Fix build on Termux (Android). Most android devices don't have
> <sys/fanotify.h> on Termux. Skip the test if it's not available.
>
>
Applied, thanks!
[1/1] test/fsnotify: Skip fsnotify test if sys/fanotify.h not available
commit: 2f4296d06878cf5f8abc75549cdabcb96e34d8fa
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-14 16:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-14 16:46 [PATCH] test/fsnotify: Skip fsnotify test if sys/fanotify.h not available Alviro Iskandar Setiawan
2023-02-14 16:49 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox