Merge pull request #7468 from yuwata/fix-7362

test and meson cleanups

meson.build

@@ -442,7 +442,8 @@ foreach ident : ['secure_getenv', '__secure_getenv']
 endforeach
 
 foreach ident : [
-        ['memfd_create',      '''#include <sys/memfd.h>'''],
+        ['memfd_create',      '''#define _GNU_SOURCE
+                                 #include <sys/mman.h>'''],
         ['gettid',            '''#include <sys/types.h>'''],
         ['pivot_root',        '''#include <stdlib.h>'''],     # no known header declares pivot_root
         ['name_to_handle_at', '''#define _GNU_SOURCE

src/basic/fileio.c

@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>

test/hwdb-test.sh

@@ -22,6 +22,7 @@
 
 set -e
 
+export SYSTEMD_LOG_LEVEL=info
 ROOTDIR=$(dirname $(dirname $(readlink -f $0)))
 SYSTEMD_HWDB=./systemd-hwdb
 

tools/meson-check-help.sh

@@ -1,5 +1,7 @@
 #!/bin/sh -eu
 
+export SYSTEMD_LOG_LEVEL=info
+
 # output width
 if "$1"  --help | grep -v 'default:' | grep -E -q '.{80}.'; then
         echo "$(basename "$1") --help output is too wide:"