[glibc/fw/linux-5.2] WIP limit constant comparison tests

[glibc/fw/linux-5.2] WIP limit constant comparison tests

[Florian Weimer]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fe992bf8243165375ce3e04bc041d5cffd100b45

commit fe992bf8243165375ce3e04bc041d5cffd100b45
Author: Florian Weimer <fweimer@redhat.com>
Date:   Sun Jul 21 21:34:45 2019 +0200

    WIP limit constant comparison tests

Diff:
---
 sysdeps/unix/sysv/linux/tst-socket-consts.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/tst-socket-consts.py b/sysdeps/unix/sysv/linux/tst-socket-consts.py
index fc1d75c..80267ab 100644
--- a/sysdeps/unix/sysv/linux/tst-socket-consts.py
+++ b/sysdeps/unix/sysv/linux/tst-socket-consts.py
@@ -33,19 +33,22 @@ def main():
 
     def check(define):
         return glibcextract.compare_macro_consts(
-            define + '#include <sys/socket.h>\n',
+            source_1=define + '#include <sys/socket.h>\n',
             # Some constants in <asm/socket.h> may depend on the size
             # of pid_t or time_t.
-            '#include <sys/types.h>\n'
+            source_2='#include <sys/types.h>\n'
             '#include <asm/socket.h>\n',
             args.cc,
-            macro_re='.*',
-            # Ignore internal macros.
-            exclude_re='MODULE_NAME|TOP_NAMESPACE|_[A-Z_].*',
+            # We cannot compare all macros because some macros cannot
+            # be expanded as constants, and glibcextract currently is
+            # not able to isolate errors.
+            macro_re='SOL?_.*',
             # <sys/socket.h> and <asm/socket.h> are not a good match.
             # Most socket-related constants are not defined in any
             # UAPI header.  Check only the intersection of the macros
-            # in both headers.
+            # in both headers.  Regular tests ensure that expected
+            # macros for _GNU_SOURCE are present, and the conformance
+            # tests cover most of the other modes.
             allow_extra_1=True,
             allow_extra_2=True)
     # _GNU_SOURCE is defined by include/libc-symbols.h, which is

[glibc/fw/linux-5.2] WIP limit constant comparison tests

[Florian Weimer]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c4a79ee70b25aded8f706eb1dc3027a2860db1a1

commit c4a79ee70b25aded8f706eb1dc3027a2860db1a1
Author: Florian Weimer <fweimer@redhat.com>
Date:   Sun Jul 21 22:00:00 2019 +0200

    WIP limit constant comparison tests

Diff:
---
 sysdeps/unix/sysv/linux/tst-socket-consts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysdeps/unix/sysv/linux/tst-socket-consts.py b/sysdeps/unix/sysv/linux/tst-socket-consts.py
index 80267ab..ca26341 100644
--- a/sysdeps/unix/sysv/linux/tst-socket-consts.py
+++ b/sysdeps/unix/sysv/linux/tst-socket-consts.py
@@ -38,7 +38,7 @@ def main():
             # of pid_t or time_t.
             source_2='#include <sys/types.h>\n'
             '#include <asm/socket.h>\n',
-            args.cc,
+            cc=args.cc,
             # We cannot compare all macros because some macros cannot
             # be expanded as constants, and glibcextract currently is
             # not able to isolate errors.