about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-03-07 17:28:13 +0100
committerFlorian Weimer <fweimer@redhat.com>2019-03-07 17:28:13 +0100
commit27a2f2f34c9e77815c6367cf670e24cbac0db7c0 (patch)
treec1116c1da196d9eb1818a2f9eb377a73f5c2bdc4
parentae514971341dcc08ec7f8622493a65e7eb1ef9d2 (diff)
downloadglibc-27a2f2f34c9e77815c6367cf670e24cbac0db7c0.tar.gz
glibc-27a2f2f34c9e77815c6367cf670e24cbac0db7c0.tar.xz
glibc-27a2f2f34c9e77815c6367cf670e24cbac0db7c0.zip
check-wrapper-headers test: Adjust Fortran include file directory
The check for "/finclude/" fails with the actual location of
Fortran headers because they are now stored in the "finclude"
subdirectory of the top-level include directory, so a relative path
does not contain a slash '/' before the "finclude" string.
-rw-r--r--ChangeLog5
-rw-r--r--scripts/check-wrapper-headers.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ee9eebb773..c657d7918b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-03-07  Florian Weimer  <fweimer@redhat.com>
+
+	* scripts/check-wrapper-headers.py (check_headers): Adjust Fortran
+	header check.
+
 2019-03-07  Martin Liska  <mliska@suse.cz>
 
 	* math/Makefile: Change location where math-vector-fortran.h is
diff --git a/scripts/check-wrapper-headers.py b/scripts/check-wrapper-headers.py
index dc9fd86063..bae99c14c7 100644
--- a/scripts/check-wrapper-headers.py
+++ b/scripts/check-wrapper-headers.py
@@ -76,7 +76,7 @@ def check_headers(args):
         is_nonsysdep_header = os.access(header, os.R_OK)
         if is_nonsysdep_header:
             # Skip Fortran header files.
-            if '/finclude/' in header:
+            if header.startswith("finclude/"):
                 continue
 
             include_path = os.path.join(args.root, INCLUDE, header)