X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=conform%2Fconformtest.pl;h=dc3712ea66fd1bb7bea5aeb6f3550059572d552d;hb=d22956c99b81958fdfb8437361f92b9d8a6e7984;hp=cfb23f2602973724d7f844c3a8eb952460b69d0d;hpb=12b64309cfa2289e57d439ec9f2d645c59f7bcf1;p=platform%2Fupstream%2Fglibc.git diff --git a/conform/conformtest.pl b/conform/conformtest.pl index cfb23f2..dc3712e 100644 --- a/conform/conformtest.pl +++ b/conform/conformtest.pl @@ -1,46 +1,68 @@ #! /usr/bin/perl use Getopt::Long; +use POSIX; +$standard = "XOPEN2K8"; $CC = "gcc"; - -$dialect="XOPEN2K"; -GetOptions ('headers=s' => \@headers, 'dialect=s' => \$dialect); +$tmpdir = "/tmp"; +GetOptions ('headers=s' => \@headers, 'standard=s' => \$standard, + 'flags=s' => \$flags, 'cc=s' => \$CC, 'tmpdir=s' => \$tmpdir); @headers = split(/,/,join(',',@headers)); # List of the headers we are testing. if (@headers == ()) { @headers = ("wordexp.h", "wctype.h", "wchar.h", "varargs.h", "utmpx.h", - "utime.h", "unistd.h", "ulimit.h", "ucontext.h", "time.h", - "termios.h", "tar.h", "sys/wait.h", "sys/utsname.h", "sys/un.h", - "sys/uio.h", "sys/types.h", "sys/times.h", "sys/timeb.h", - "sys/time.h", "sys/statvfs.h", "sys/stat.h", "sys/socket.h", - "sys/shm.h", "sys/sem.h", "sys/resource.h", "sys/msg.h", - "sys/mman.h", "sys/ipc.h", "syslog.h", "stropts.h", "strings.h", - "string.h", "stdlib.h", "stdio.h", "stdint.h", "stddef.h", - "stdarg.h", "spawn.h", "signal.h", "setjmp.h", "semaphore.h", - "search.h", "sched.h", "regex.h", "pwd.h", "pthread.h", - "poll.h", "nl_types.h", "netinet/tcp.h", "netinet/in.h", - "net/if.h", "netdb.h", "ndbm.h", "mqueue.h", "monetary.h", - "math.h", "locale.h", "libgen.h", "limits.h", "langinfo.h", - "iso646.h", "inttypes.h", "iconv.h", "grp.h", "glob.h", "ftw.h", - "fnmatch.h", "fmtmsg.h", "float.h", "fcntl.h", "errno.h", - "dlfcn.h", "dirent.h", "ctype.h", "cpio.h", "assert.h", + "utime.h", "unistd.h", "ulimit.h", "ucontext.h", "uchar.h", + "time.h", "tgmath.h", "termios.h", "tar.h", "sys/wait.h", + "sys/utsname.h", "sys/un.h", "sys/uio.h", "sys/types.h", + "sys/times.h", "sys/timeb.h", "sys/time.h", "sys/statvfs.h", + "sys/stat.h", "sys/socket.h", "sys/shm.h", "sys/sem.h", + "sys/select.h", "sys/resource.h", "sys/msg.h", "sys/mman.h", + "sys/ipc.h", "syslog.h", "stropts.h", "strings.h", "string.h", + "stdlib.h", "stdio.h", "stdint.h", "stddef.h", "stdarg.h", + "spawn.h", "signal.h", "setjmp.h", "semaphore.h", "search.h", + "sched.h", "regex.h", "pwd.h", "pthread.h", "poll.h", + "nl_types.h", "netinet/tcp.h", "netinet/in.h", "net/if.h", + "netdb.h", "ndbm.h", "mqueue.h", "monetary.h", "math.h", + "locale.h", "libgen.h", "limits.h", "langinfo.h", "iso646.h", + "inttypes.h", "iconv.h", "grp.h", "glob.h", "ftw.h", "fnmatch.h", + "fmtmsg.h", "float.h", "fcntl.h", "errno.h", "dlfcn.h", + "dirent.h", "ctype.h", "cpio.h", "complex.h", "assert.h", "arpa/inet.h", "aio.h"); } -if ($dialect ne "ISO" && $dialect ne "POSIX" && $dialect ne "XPG3" - && $dialect ne "XPG4" && $dialect ne "UNIX98" && $dialect ne "XOPEN2K") { - die "unknown dialect \"$dialect\""; -} - -$CFLAGS{"ISO"} = "-I. '-D__attribute__(x)=' -ansi"; -$CFLAGS{"POSIX"} = "-I. '-D__attribute__(x)=' -D_POSIX_C_SOURCE=199912"; -$CFLAGS{"XPG3"} = "-I. '-D__attribute__(x)=' -D_XOPEN_SOURCE"; -$CFLAGS{"XPG4"} = "-I. '-D__attribute__(x)=' -D_XOPEN_SOURCE_EXTENDED"; -$CFLAGS{"UNIX98"} = "-I. '-D__attribute__(x)=' -D_XOPEN_SOURCE=500"; -$CFLAGS{"XOPEN2K"} = "-I. '-D__attribute__(x)=' -D_XOPEN_SOURCE=600"; - +$CFLAGS{"ISO"} = "-ansi"; +$CFLAGS{"ISO99"} = "-std=c99"; +$CFLAGS{"ISO11"} = "-std=c1x -D_ISOC11_SOURCE"; +$CFLAGS{"POSIX"} = "-D_POSIX_C_SOURCE=199912 -ansi"; +$CFLAGS{"XPG3"} = "-ansi -D_XOPEN_SOURCE"; +$CFLAGS{"XPG4"} = "-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"; + +$CFLAGS = "$flags -fno-builtin '-D__attribute__(x)=' $CFLAGS{$standard} -D_ISOMAC"; + +# Check standard name for validity. +die "unknown standard \"$standard\"" if ($CFLAGS{$standard} eq ""); + +# if ($standard ne "XOPEN2K8" && $standard ne "POSIX2008") { +# # Some headers need a bit more attention. At least with XPG7 +# # all headers should be self-contained. +# $mustprepend{'inttypes.h'} = "#include \n"; +# $mustprepend{'glob.h'} = "#include \n"; +# $mustprepend{'grp.h'} = "#include \n"; +# $mustprepend{'regex.h'} = "#include \n"; +# $mustprepend{'pwd.h'} = "#include \n"; +# $mustprepend{'sched.h'} = "#include \n"; +# $mustprepend{'signal.h'} = "#include \n#include \n"; +# $mustprepend{'stdio.h'} = "#include \n"; +# $mustprepend{'sys/stat.h'} = "#include \n"; +# $mustprepend{'wchar.h'} = "#include \n"; +# $mustprepend{'wordexp.h'} = "#include \n"; +# } # These are the ISO C99 keywords. @keywords = ('auto', 'break', 'case', 'char', 'const', 'continue', 'default', @@ -49,25 +71,11 @@ $CFLAGS{"XOPEN2K"} = "-I. '-D__attribute__(x)=' -D_XOPEN_SOURCE=600"; 'short', 'signed', 'sizeof', 'static', 'struct', 'switch', 'typedef', 'union', 'unsigned', 'void', 'volatile', 'while'); -# These are symbols which are known to pollute the namespace. -@knownproblems = ('unix', 'linux', 'i386'); - -# Some headers need a bit more attention. -$mustprepend{'regex.h'} = "#include \n"; -$mustprepend{'wordexp.h'} = "#include \n"; - # Make a hash table from this information. while ($#keywords >= 0) { $iskeyword{pop (@keywords)} = 1; } -# Make a hash table from the known problems. -while ($#knownproblems >= 0) { - $isknown{pop (@knownproblems)} = 1; -} - -$tmpdir = "/tmp"; - $verbose = 1; $total = 0; @@ -85,9 +93,17 @@ sub poorfnmatch { $res = ($strlen >= $patlen && substr ($pattern, -$patlen, $patlen) eq substr ($string, -$patlen, $patlen)); } elsif (substr ($pattern, -1, 1) eq '*') { - my($patlen) = length ($pattern) - 1; - $res = ($strlen >= $patlen - && substr ($pattern, 0, $patlen) eq substr ($string, 0, $patlen)); + if (substr ($pattern, -2, 1) eq ']') { + my($patlen) = index ($pattern, '['); + my($range) = substr ($pattern, $patlen + 1, -2); + $res = ($strlen > $patlen + && substr ($pattern, 0, $patlen) eq substr ($string, 0, $patlen) + && index ($range, substr ($string, $patlen, 1)) != -1); + } else { + my($patlen) = length ($pattern) - 1; + $res = ($strlen >= $patlen + && substr ($pattern, 0, $patlen) eq substr ($string, 0, $patlen)); + } } else { $res = $pattern eq $string; } @@ -108,7 +124,7 @@ sub compiletest ++$skipped; printf (" SKIP\n"); } else { - $ret = system "$CC $CFLAGS{$dialect} -c $fnamebase.c -o $fnamebase.o > $fnamebase.out 2>&1"; + $ret = system "$CC $CFLAGS -c $fnamebase.c -o $fnamebase.o > $fnamebase.out 2>&1"; if ($ret != 0) { if ($optional != 0) { printf (" $errmsg\n"); @@ -160,7 +176,7 @@ sub runtest ++$skipped; printf (" SKIP\n"); } else { - $ret = system "$CC $CFLAGS{$dialect} -o $fnamebase $fnamebase.c > $fnamebase.out 2>&1"; + $ret = system "$CC $CFLAGS -o $fnamebase $fnamebase.c > $fnamebase.out 2>&1"; if ($ret != 0) { printf (" FAIL\n"); if ($verbose != 0) { @@ -216,15 +232,17 @@ sub newtoken { for ($idx = 0; $idx <= $#allow; ++$idx) { return if (poorfnmatch ($allow[$idx], $token)); } +} - if ($isknown{$token}) { - ++$nknown; - } else { - ++$nerrors; - if ($nerrors == 1) { - printf ("FAIL\n " . "-" x 72 . "\n"); - } - printf (" Namespace violation: \"%s\"\n", $token); + +sub removetoken { + my($token) = @_; + my($idx); + + return if ($token =~ /^[0-9_]/ || $iskeyword{$token}); + + if (exists $errors{$token}) { + undef $errors{$token}; } } @@ -239,14 +257,15 @@ sub checknamespace { print TESTFILE "#include <$h>\n"; close (TESTFILE); - $nerrors = 0; + undef %errors; $nknown = 0; - open (CONTENT, "$CC $CFLAGS{$dialect} -E $fnamebase.c -P -Wp,-dN | sed -e '/^# [1-9]/d' -e '/^[[:space:]]*\$/d' |"); + open (CONTENT, "$CC $CFLAGS -E $fnamebase.c -P -Wp,-dN | sed -e '/^# [1-9]/d' -e '/^[[:space:]]*\$/d' |"); loop: while () { - next loop if (/^#undef /); chop; if (/^#define (.*)/) { newtoken ($1, @allow); + } elsif (/^#undef (.*)/) { + removetoken ($1); } else { # We have to tokenize the line. my($str) = $_; @@ -262,13 +281,23 @@ sub checknamespace { } close (CONTENT); unlink "$fnamebase.c"; - if ($nerrors != 0) { - printf (" " . "-" x 72 . "\n"); - ++$errors; - } elsif ($nknown > 0) { - printf ("EXPECTED FAILURES\n"); - ++$known; - } else { + $realerror = 0; + if ($#errors != 0) { + # Sort the output list so it's easier to compare results with diff. + foreach $f (sort keys(%errors)) { + if ($errors{$f} == 1) { + if ($realerror == 0) { + printf ("FAIL\n " . "-" x 72 . "\n"); + $realerror = 1; + ++$errors; + } + printf (" Namespace violation: \"%s\"\n", $f); + } + } + printf (" " . "-" x 72 . "\n") if ($realerror != 0); + } + + if ($realerror == 0) { printf ("OK\n"); } } @@ -279,32 +308,41 @@ while ($#headers >= 0) { my($hf) = $h; $hf =~ s|/|-|; my($fnamebase) = "$tmpdir/$hf-test"; - my($missing); + my($missing) = 1; my(@allow) = (); my(@allowheader) = (); my(%seenheader) = (); my($prepend) = $mustprepend{$h}; + my($test_exist) = 1; printf ("Testing <$h>\n"); printf ("----------" . "-" x length ($h) . "\n"); - # Generate a program to test for the availability of this header. - open (TESTFILE, ">$fnamebase.c"); - print TESTFILE "$prepend"; - print TESTFILE "#include <$h>\n"; - close (TESTFILE); - - $missing = compiletest ($fnamebase, "Checking whether <$h> is available", - "Header <$h> not available", 0, 0); - - printf ("\n"); - - open (CONTROL, "$CC -E -D$dialect - < data/$h-data |"); + open (CONTROL, "$CC -E -D$standard -x c data/$h-data |"); control: while () { chop; next control if (/^#/); next control if (/^[ ]*$/); + if ($test_exist) { + $test_exist = 0; + # Generate a program to test for the availability of this header. + open (TESTFILE, ">$fnamebase.c"); + print TESTFILE "$prepend"; + print TESTFILE "#include <$h>\n"; + close (TESTFILE); + + $missing = compiletest ($fnamebase, "Checking whether <$h> is available", + "Header <$h> not available", 0, 0); + printf ("\n"); + last control if ($missing); + } + + my($optional) = 0; + if (/^optional-/) { + s/^optional-//; + $optional = 1; + } if (/^element *({([^}]*)}|([^{ ]*)) *({([^}]*)}|([^{ ]*)) *([A-Za-z0-9_]*) *(.*)/) { my($struct) = "$2$3"; my($type) = "$5$6"; @@ -328,52 +366,26 @@ while ($#headers >= 0) { close (TESTFILE); $res = compiletest ($fnamebase, "Testing for member $member", - "Member \"$member\" not available.", $res, 0); - - - # Test the types of the members. - open (TESTFILE, ">$fnamebase.c"); - print TESTFILE "$prepend"; - print TESTFILE "#include <$h>\n"; - print TESTFILE "$struct a;\n"; - print TESTFILE "extern $type b$rest;\n"; - print TESTFILE "extern __typeof__ (a.$member) b;\n"; - close (TESTFILE); - - compiletest ($fnamebase, "Testing for type of member $member", - "Member \"$member\" does not have the correct type.", $res); - } elsif (/^optional-constant *([a-zA-Z0-9_]*) ([>=<]+) ([A-Za-z0-9_]*)/) { - my($const) = $1; - my($op) = $2; - my($value) = $3; - my($res) = $missing; + ($optional + ? "NOT AVAILABLE." + : "Member \"$member\" not available."), $res, + $optional); - # Remember that this name is allowed. - push @allow, $const; - - # Generate a program to test for the availability of this constant. - open (TESTFILE, ">$fnamebase.c"); - print TESTFILE "$prepend"; - print TESTFILE "#include <$h>\n"; - print TESTFILE "__typeof__ ($const) a = $const;\n"; - close (TESTFILE); - - $res = compiletest ($fnamebase, "Testing for constant $const", - "NOT PRESENT", $res, 1); - - if ($value ne "" && $res == 0) { - # Generate a program to test for the value of this constant. + if ($res == 0 || $missing != 0 || !$optional) { + # Test the types of the members. open (TESTFILE, ">$fnamebase.c"); print TESTFILE "$prepend"; print TESTFILE "#include <$h>\n"; - # Negate the value since 0 means ok - print TESTFILE "int main (void) { return !($const $op $value); }\n"; + print TESTFILE "$struct a;\n"; + print TESTFILE "extern $type b$rest;\n"; + print TESTFILE "extern __typeof__ (a.$member) b;\n"; close (TESTFILE); - $res = runtest ($fnamebase, "Testing for value of constant $const", - "Constant \"$const\" has not the right value.", $res); + compiletest ($fnamebase, "Testing for type of member $member", + "Member \"$member\" does not have the correct type.", + $res, 0); } - } elsif (/^constant *([a-zA-Z0-9_]*) *([>=<]+) ([A-Za-z0-9_]*)/) { + } elsif (/^constant *([a-zA-Z0-9_]*) *(?:([>== 0) { close (TESTFILE); $res = compiletest ($fnamebase, "Testing for constant $const", - "Constant \"$const\" not available.", $res, 0); + ($optional + ? "NOT PRESENT" + : "Constant \"$const\" not available."), $res, + $optional); - if ($value ne "") { + if (defined ($op) && ($res == 0 || !$optional)) { # Generate a program to test for the value of this constant. open (TESTFILE, ">$fnamebase.c"); print TESTFILE "$prepend"; @@ -404,7 +419,7 @@ while ($#headers >= 0) { $res = runtest ($fnamebase, "Testing for value of constant $const", "Constant \"$const\" has not the right value.", $res); } - } elsif (/^typed-constant *([a-zA-Z0-9_]*) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*)?/) { + } elsif (/^typed-constant *([a-zA-Z0-9_]*) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_-]*)?/) { my($const) = $1; my($type) = "$3$4"; my($value) = $5; @@ -446,107 +461,67 @@ while ($#headers >= 0) { $res = runtest ($fnamebase, "Testing for value of constant $const", "Constant \"$const\" has not the right value.", $res); } - } elsif (/^optional-constant *([a-zA-Z0-9_]*) *([A-Za-z0-9_]*)?/) { - my($const) = $1; + } elsif (/^symbol *([a-zA-Z0-9_]*) *([A-Za-z0-9_-]*)?/) { + my($symbol) = $1; my($value) = $2; my($res) = $missing; # Remember that this name is allowed. - push @allow, $const; + push @allow, $symbol; # Generate a program to test for the availability of this constant. open (TESTFILE, ">$fnamebase.c"); print TESTFILE "$prepend"; print TESTFILE "#include <$h>\n"; - print TESTFILE "__typeof__ ($const) a = $const;\n"; - close (TESTFILE); - - $res = compiletest ($fnamebase, "Testing for constant $const", - "NOT PRESENT", $res, 1); - - if ($value ne "" && $res == 0) { - # Generate a program to test for the value of this constant. - open (TESTFILE, ">$fnamebase.c"); - print TESTFILE "$prepend"; - print TESTFILE "#include <$h>\n"; - print TESTFILE "int main (void) { return $const != $value; }\n"; - close (TESTFILE); - - $res = runtest ($fnamebase, "Testing for value of constant $const", - "Constant \"$const\" has not the right value.", $res); - } - } elsif (/^constant *([a-zA-Z0-9_]*) *([A-Za-z0-9_]*)?/) { - my($const) = $1; - my($value) = $2; - my($res) = $missing; - - # Remember that this name is allowed. - push @allow, $const; - - # Generate a program to test for the availability of this constant. - open (TESTFILE, ">$fnamebase.c"); - print TESTFILE "$prepend"; - print TESTFILE "#include <$h>\n"; - print TESTFILE "__typeof__ ($const) a = $const;\n"; + print TESTFILE "void foobarbaz (void) {\n"; + print TESTFILE "__typeof__ ($symbol) a = $symbol;\n"; + print TESTFILE "}\n"; close (TESTFILE); - $res = compiletest ($fnamebase, "Testing for constant $const", - "Constant \"$const\" not available.", $res, 0); + $res = compiletest ($fnamebase, "Testing for symbol $symbol", + "Symbol \"$symbol\" not available.", $res, 0); if ($value ne "") { # Generate a program to test for the value of this constant. open (TESTFILE, ">$fnamebase.c"); print TESTFILE "$prepend"; print TESTFILE "#include <$h>\n"; - print TESTFILE "int main (void) { return $const != $value; }\n"; + print TESTFILE "int main (void) { return $symbol != $value; }\n"; close (TESTFILE); - $res = runtest ($fnamebase, "Testing for value of constant $const", - "Constant \"$const\" has not the right value.", $res); + $res = runtest ($fnamebase, "Testing for value of symbol $symbol", + "Symbol \"$symbol\" has not the right value.", $res); } - } elsif (/^typed-constant *([a-zA-Z0-9_]*) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*)?/) { - my($const) = $1; - my($type) = "$3$4"; - my($value) = $5; - my($res) = $missing; + } elsif (/^type *({([^}]*)|([a-zA-Z0-9_]*))/) { + my($type) = "$2$3"; + my($maybe_opaque) = 0; # Remember that this name is allowed. - push @allow, $const; - - # Generate a program to test for the availability of this constant. - open (TESTFILE, ">$fnamebase.c"); - print TESTFILE "$prepend"; - print TESTFILE "#include <$h>\n"; - print TESTFILE "__typeof__ ($const) a = $const;\n"; - close (TESTFILE); - - $res = compiletest ($fnamebase, "Testing for constant $const", - "Constant \"$const\" not available.", $res, 0); + if ($type =~ /^struct *(.*)/) { + push @allow, $1; + } elsif ($type =~ /^union *(.*)/) { + push @allow, $1; + } else { + push @allow, $type; + $maybe_opaque = 1; + } - # Test the types of the members. + # Generate a program to test for the availability of this type. open (TESTFILE, ">$fnamebase.c"); print TESTFILE "$prepend"; print TESTFILE "#include <$h>\n"; - print TESTFILE "__typeof__ (($type) 0) a;\n"; - print TESTFILE "extern __typeof__ ($const) a;\n"; + if ($maybe_opaque == 1) { + print TESTFILE "$type *a;\n"; + } else { + print TESTFILE "$type a;\n"; + } close (TESTFILE); - compiletest ($fnamebase, "Testing for type of constant $const", - "Constant \"$const\" does not have the correct type.", - $res, 0); - - if ($value ne "") { - # Generate a program to test for the value of this constant. - open (TESTFILE, ">$fnamebase.c"); - print TESTFILE "$prepend"; - print TESTFILE "#include <$h>\n"; - print TESTFILE "int main (void) { return $const != $value; }\n"; - close (TESTFILE); - - $res = runtest ($fnamebase, "Testing for value of constant $const", - "Constant \"$const\" has not the right value.", $res); - } - } elsif (/^type *({([^}]*)|([a-zA-Z0-9_]*))/) { + compiletest ($fnamebase, "Testing for type $type", + ($optional + ? "NOT AVAILABLE" + : "Type \"$type\" not available."), $missing, $optional); + } elsif (/^tag *({([^}]*)|([a-zA-Z0-9_]*))/) { my($type) = "$2$3"; # Remember that this name is allowed. @@ -558,14 +533,11 @@ while ($#headers >= 0) { push @allow, $type; } - # Remember that this name is allowed. - push @allow, $type; - - # Generate a program to test for the availability of this constant. + # Generate a program to test for the availability of this type. open (TESTFILE, ">$fnamebase.c"); print TESTFILE "$prepend"; print TESTFILE "#include <$h>\n"; - print TESTFILE "$type *a;\n"; + print TESTFILE "$type;\n"; close (TESTFILE); compiletest ($fnamebase, "Testing for type $type", @@ -588,19 +560,24 @@ while ($#headers >= 0) { close (TESTFILE); $res = compiletest ($fnamebase, "Test availability of function $fname", - "Function \"$fname\" is not available.", $res, 0); + ($optional + ? "NOT AVAILABLE" + : "Function \"$fname\" is not available."), $res, + $optional); - # Generate a program to test for the type of this function. - open (TESTFILE, ">$fnamebase.c"); - print TESTFILE "$prepend"; - print TESTFILE "#include <$h>\n"; - # print TESTFILE "#undef $fname\n"; - print TESTFILE "extern $rettype (*(*foobarbaz) $args;\n"; - print TESTFILE "extern __typeof__ (&$fname) foobarbaz;\n"; - close (TESTFILE); + if ($res == 0 || $missing == 1 || !$optional) { + # Generate a program to test for the type of this function. + open (TESTFILE, ">$fnamebase.c"); + print TESTFILE "$prepend"; + print TESTFILE "#include <$h>\n"; + # print TESTFILE "#undef $fname\n"; + print TESTFILE "extern $rettype (*(*foobarbaz) $args;\n"; + print TESTFILE "extern __typeof__ (&$fname) foobarbaz;\n"; + close (TESTFILE); - compiletest ($fnamebase, "Test for type of function $fname", - "Function \"$fname\" has incorrect type.", $res, 0); + compiletest ($fnamebase, "Test for type of function $fname", + "Function \"$fname\" has incorrect type.", $res, 0); + } } elsif (/^function *({([^}]*)}|([a-zA-Z0-9_]*)) ([a-zA-Z0-9_]*) ([(].*[)])/) { my($rettype) = "$2$3"; my($fname) = "$4"; @@ -619,22 +596,28 @@ while ($#headers >= 0) { close (TESTFILE); $res = compiletest ($fnamebase, "Test availability of function $fname", - "Function \"$fname\" is not available.", $res, 0); + ($optional + ? "NOT AVAILABLE" + : "Function \"$fname\" is not available."), $res, + $optional); - # Generate a program to test for the type of this function. - open (TESTFILE, ">$fnamebase.c"); - print TESTFILE "$prepend"; - print TESTFILE "#include <$h>\n"; - # print TESTFILE "#undef $fname\n"; - print TESTFILE "extern $rettype (*foobarbaz) $args;\n"; - print TESTFILE "extern __typeof__ (&$fname) foobarbaz;\n"; - close (TESTFILE); + if ($res == 0 || $missing != 0 || !$optional) { + # Generate a program to test for the type of this function. + open (TESTFILE, ">$fnamebase.c"); + print TESTFILE "$prepend"; + print TESTFILE "#include <$h>\n"; + # print TESTFILE "#undef $fname\n"; + print TESTFILE "extern $rettype (*foobarbaz) $args;\n"; + print TESTFILE "extern __typeof__ (&$fname) foobarbaz;\n"; + close (TESTFILE); - compiletest ($fnamebase, "Test for type of function $fname", - "Function \"$fname\" has incorrect type.", $res, 0); - } elsif (/^variable *({([^}]*)}|([a-zA-Z0-9_]*)) ([a-zA-Z0-9_]*)/) { + compiletest ($fnamebase, "Test for type of function $fname", + "Function \"$fname\" has incorrect type.", $res, 0); + } + } elsif (/^variable *({([^}]*)}|([a-zA-Z0-9_]*)) ([a-zA-Z0-9_]*) *(.*)/) { my($type) = "$2$3"; my($vname) = "$4"; + my($rest) = "$5"; my($res) = $missing; # Remember that this name is allowed. @@ -645,7 +628,8 @@ while ($#headers >= 0) { print TESTFILE "$prepend"; print TESTFILE "#include <$h>\n"; # print TESTFILE "#undef $fname\n"; - print TESTFILE "$type *foobarbaz = &$vname;\n"; + print TESTFILE "typedef $type xyzzy$rest;\n"; + print TESTFILE "$xyzzy *foobarbaz = &$vname;\n"; close (TESTFILE); $res = compiletest ($fnamebase, "Test availability of variable $vname", @@ -656,7 +640,7 @@ while ($#headers >= 0) { print TESTFILE "$prepend"; print TESTFILE "#include <$h>\n"; # print TESTFILE "#undef $fname\n"; - print TESTFILE "extern $type $vname;\n"; + print TESTFILE "extern $type $vname$rest;\n"; close (TESTFILE); compiletest ($fnamebase, "Test for type of variable $fname", @@ -679,7 +663,7 @@ while ($#headers >= 0) { print TESTFILE "#endif\n"; close (TESTFILE); - $res = compiletest ($fnamebase, "Test availability of function $fname", + $res = compiletest ($fnamebase, "Test availability of macro $fname", "Function \"$fname\" is not available.", $res, 0); # Generate a program to test for the type of this function. @@ -692,7 +676,7 @@ while ($#headers >= 0) { print TESTFILE "#endif\n"; close (TESTFILE); - compiletest ($fnamebase, "Test for type of function $fname", + compiletest ($fnamebase, "Test for type of macro $fname", "Function \"$fname\" has incorrect type.", $res, 0); } elsif (/^macro-str *([^ ]*) *(\".*\")/) { # The above regex doesn't handle a \" in a string. @@ -726,8 +710,11 @@ while ($#headers >= 0) { $res = runtest ($fnamebase, "Testing for value of macro $macro", "Macro \"$macro\" has not the right value.", $res); - } elsif (/^optional-macro *([^ ]*)/) { + } elsif (/^macro *([a-zA-Z0-9_]*) *([>== 0) { print TESTFILE "#endif\n"; close (TESTFILE); - compiletest ($fnamebase, "Test availability of macro $macro", - "NOT PRESENT", $missing, 1); - } elsif (/^macro *([a-zA-Z0-9_]*) *([>=<]+) ([A-Za-z0-9_]*)/) { + $res = compiletest ($fnamebase, "Test availability of macro $macro", + ($optional + ? "NOT PRESENT" + : "Macro \"$macro\" is not available."), $res, + $optional); + + if ($value ne "" && ($res == 0 || !$optional)) { + # Generate a program to test for the value of this constant. + open (TESTFILE, ">$fnamebase.c"); + print TESTFILE "$prepend"; + print TESTFILE "#include <$h>\n"; + # Negate the value since 0 means ok + print TESTFILE "int main (void) { return !($macro $op $value); }\n"; + close (TESTFILE); + + $res = runtest ($fnamebase, "Testing for value of macro $macro", + "Macro \"$macro\" has not the right value.", $res); + } + } elsif (/^macro *([a-zA-Z0-9_]*) *([A-Za-z0-9_]*)/) { my($macro) = "$1"; - my($op) = $2; - my($value) = $3; + my($value) = $2; my($res) = $missing; # Remember that this name is allowed. @@ -762,18 +764,21 @@ while ($#headers >= 0) { close (TESTFILE); $res = compiletest ($fnamebase, "Test availability of macro $macro", - "Macro \"$macro\" is not available.", $res, 0); + ($optional + ? "NOT PRESENT" + : "Macro \"$macro\" is not available."), $res, + $optional); - if ($value ne "") { + if ($value ne "" && ($res == 0 || !$optional)) { # Generate a program to test for the value of this constant. open (TESTFILE, ">$fnamebase.c"); print TESTFILE "$prepend"; print TESTFILE "#include <$h>\n"; # Negate the value since 0 means ok - print TESTFILE "int main (void) { return !($macro $op $value); }\n"; + print TESTFILE "int main (void) { return !($macro == $value); }\n"; close (TESTFILE); - $res = runtest ($fnamebase, "Testing for value of constant $macro", + $res = runtest ($fnamebase, "Testing for value of macro $macro", "Macro \"$macro\" has not the right value.", $res); } } elsif (/^macro *([^ ]*)/) { @@ -792,7 +797,10 @@ while ($#headers >= 0) { close (TESTFILE); compiletest ($fnamebase, "Test availability of macro $macro", - "Macro \"$macro\" is not available.", $missing, 0); + ($optional + ? "NOT PRESENT" + : "Macro \"$macro\" is not available."), $missing, + $optional); } elsif (/^allow-header *(.*)/) { my($pattern) = $1; if ($seenheader{$pattern} != 1) { @@ -817,19 +825,20 @@ while ($#headers >= 0) { while ($#allowheader >= 0) { my($ah) = pop @allowheader; - open (ALLOW, "$CC -E -D$dialect - < data/$ah-data |"); + open (ALLOW, "$CC -E -D$standard - < data/$ah-data |"); acontrol: while () { + chop; next acontrol if (/^#/); next acontrol if (/^[ ]*$/); if (/^element *({([^}]*)}|([^ ]*)) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*) *(.*)/) { push @allow, $7; - } elsif (/^constant *([a-zA-Z0-9_]*) *([A-Za-z0-9_]*)?/) { + } elsif (/^constant *([a-zA-Z0-9_]*) *(?:([>== 0) { push @allow, $4; } elsif (/^macro *([^ ]*)/) { push @allow, $1; + } elsif (/^symbol *([a-zA-Z0-9_]*) *([A-Za-z0-9_-]*)?/) { + push @allow, $1; } elsif (/^allow-header *(.*)/) { if ($seenheader{$1} != 1) { push @allowheader, $1; @@ -861,13 +872,17 @@ while ($#headers >= 0) { close (ALLOW); } - # Now check the namespace. - printf (" Checking the namespace of \"%s\"... ", $h); - if ($missing) { - ++$skipped; - printf ("SKIP\n"); + if ($test_exist) { + printf (" Not defined\n"); } else { - checknamespace ($h, $fnamebase, @allow); + # Now check the namespace. + printf (" Checking the namespace of \"%s\"... ", $h); + if ($missing) { + ++$skipped; + printf ("SKIP\n"); + } else { + checknamespace ($h, $fnamebase, @allow); + } } printf ("\n\n"); @@ -876,14 +891,6 @@ while ($#headers >= 0) { printf "-" x 76 . "\n"; printf (" Total number of tests : %4d\n", $total); -printf (" Number of known failures: %4d (", $known); -$percent = ($known * 100) / $total; -if ($known > 0 && $percent < 1.0) { - printf (" <1%%)\n"); -} else { - printf ("%3d%%)\n", $percent); -} - printf (" Number of failed tests : %4d (", $errors); $percent = ($errors * 100) / $total; if ($errors > 0 && $percent < 1.0) { @@ -901,3 +908,6 @@ if ($skipped > 0 && $percent < 1.0) { } exit $errors != 0; +# Local Variables: +# perl-indent-level: 2 +# End: