diff options
author | Joseph Myers <joseph@codesourcery.com> | 2018-11-09 13:54:06 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2018-11-09 13:54:06 +0000 |
commit | c3ec097256a1fad362bdc9cdaf56fddf3c621d10 (patch) | |
tree | ba987ffd27475a8719c77accade9baed0d73a070 /conform/GlibcConform.pm | |
parent | 43257c335ad6b9e05fb882975e1776ff763164ee (diff) | |
download | glibc-c3ec097256a1fad362bdc9cdaf56fddf3c621d10.tar.gz glibc-c3ec097256a1fad362bdc9cdaf56fddf3c621d10.tar.xz glibc-c3ec097256a1fad362bdc9cdaf56fddf3c621d10.zip |
Replace conformtest.pl with conformtest.py.
Continuing the consolidation on Python for various miscellaneous build and test scripts, this patch moves conformtest from Perl to Python. The substance of the tests run is intended to be the same as before, except that the previous test for tags did not actually achieve the intended purpose of verifying whether a tag was already declared, so is changed to one that would actually fail for a tag that wasn't declared, and a typo in the old test for variables being available ($xyzzy instead of xyzzy) would have made that test not use the correct type (but it would have passed anyway with warnings). No attempt is made to keep the details of what the test output looks like; instead, tests are given names which are made to follow PASS: / FAIL: / XFAIL: / SKIP: / MISSING: as appropriate. In the new version, there is more consistent parsing of test lines (into a series of words, either surrounded by {} or separated by spaces) that applies for all kinds of test lines, rather than the old approach of different regular expressions for every kind of test. A few of the conform/data/ files are adjusted so their syntax works with the new script (which now requires spaces in certain cases where the old script tolerated them being missing, and does not allow stray semicolons at the end of "function" lines). Similarly, common logic is used around what happens with a second subtest if a first one fails (e.g., a test for a symbol's type if the test for availability fails), rather than such logic being replicated separately for each kind of test. Common parsing also applies for test lines both when they are lines for the header under test and when they are lines for another header specified with allow-header, again unlike the old script. Tested for x86_64, and with build-many-glibcs.py. * conform/conformtest.py: New file. * conform/conformtest.pl: Remove. * conform/GlibcConform.pm: Likewise. * conform/glibcconform.py (KEYWORDS_C90): New constant. (KEYWORDS_C99): Likewise. (KEYWORDS): Likewise. * conform/Makefile ($(conformtest-header-tests)): Use conformtest.py instead of conformtest.pl. Do not pass --tmpdir option. Use --header instead of --headers. * conform/data/arpa/inet.h-data: Remove trailing semicolons on function entries. * conform/data/spawn.h-data: Likewise. * conform/data/fcntl.h-data (openat): Add space after function name. * conform/data/wchar.h-data (wcscasecmp): Likewise. (wcscasecmp_l): Likewise. * conform/data/termios.h-data (c_cc): Add space after element name.
Diffstat (limited to 'conform/GlibcConform.pm')
-rw-r--r-- | conform/GlibcConform.pm | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/conform/GlibcConform.pm b/conform/GlibcConform.pm deleted file mode 100644 index ba9c7e822f..0000000000 --- a/conform/GlibcConform.pm +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/perl - -# Shared code for glibc conformance tests. - -# Copyright (C) 2014-2018 Free Software Foundation, Inc. -# This file is part of the GNU C Library. - -# The GNU C Library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. - -# The GNU C Library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. - -# You should have received a copy of the GNU Lesser General Public -# License along with the GNU C Library; if not, see -# <http://www.gnu.org/licenses/>. - -package GlibcConform; -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(%CFLAGS list_exported_functions); - -# Compiler options for each standard. -$CFLAGS{"ISO"} = "-ansi"; -$CFLAGS{"ISO99"} = "-std=c99"; -$CFLAGS{"ISO11"} = "-std=c11"; -$CFLAGS{"POSIX"} = "-D_POSIX_C_SOURCE=199506L -ansi"; -$CFLAGS{"XPG4"} = "-ansi -D_XOPEN_SOURCE"; -$CFLAGS{"XPG42"} = "-ansi -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED"; -$CFLAGS{"UNIX98"} = "-ansi -D_XOPEN_SOURCE=500"; -$CFLAGS{"XOPEN2K"} = "-std=c99 -D_XOPEN_SOURCE=600"; -$CFLAGS{"XOPEN2K8"} = "-std=c99 -D_XOPEN_SOURCE=700"; -$CFLAGS{"POSIX2008"} = "-std=c99 -D_POSIX_C_SOURCE=200809L"; - -# Return a list of functions exported by a header, empty if an include -# of the header does not compile. -sub list_exported_functions { - my ($cc, $standard, $header, $tmpdir) = @_; - my ($cc_all) = "$cc -D_ISOMAC $CFLAGS{$standard}"; - my ($tmpfile) = "$tmpdir/list-$$.c"; - my ($auxfile) = "$tmpdir/list-$$.c.aux"; - my ($ret); - my (%res) = (); - open (TMPFILE, ">$tmpfile") || die ("open $tmpfile: $!\n"); - print TMPFILE "#include <$header>\n"; - close (TMPFILE) || die ("close $tmpfile: $!\n"); - $ret = system "$cc_all -c $tmpfile -o /dev/null -aux-info $auxfile > /dev/null"; - unlink ($tmpfile) || die ("unlink $tmpfile: $!\n"); - if ($ret != 0) { - return; - } - open (AUXFILE, "<$auxfile") || die ("open $auxfile: $!\n"); - while (<AUXFILE>) { - s|/\*.*?\*/||g; - if (/^\s*$/) { - next; - } - # The word before a '(' that isn't '(*' is the function name - # before the argument list (not fully general, but sufficient for - # -aux-info output on standard headers). - if (/(\w+)\s*\([^*]/) { - $res{$1} = 1; - } else { - die ("couldn't parse -aux-info output: $_\n"); - } - } - close (AUXFILE) || die ("close $auxfile: $!\n"); - unlink ($auxfile) || die ("unlink $auxfile: $!\n"); - return sort keys %res; -} |