diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-05-01 20:03:42 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-05-01 20:03:42 +0000 |
| commit | 661f8cf03b7f178c143d1ec48e75a2904ab01154 (patch) | |
| tree | 090a2cc8a8ba12b337b1e09933744879b81276cb /conform | |
| parent | ee74b9cbbdba4dc9e1c0532915d4f06751a6a561 (diff) | |
| download | glibc-661f8cf03b7f178c143d1ec48e75a2904ab01154.tar.gz glibc-661f8cf03b7f178c143d1ec48e75a2904ab01154.tar.xz glibc-661f8cf03b7f178c143d1ec48e75a2904ab01154.zip | |
conformtest: Support testing macro usability in #if.
Diffstat (limited to 'conform')
| -rw-r--r-- | conform/conformtest.pl | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/conform/conformtest.pl b/conform/conformtest.pl index 2d8cfd703c..4704debc5e 100644 --- a/conform/conformtest.pl +++ b/conform/conformtest.pl @@ -385,7 +385,7 @@ while ($#headers >= 0) { "Member \"$member\" does not have the correct type.", $res, 0); } - } elsif (/^(macro|constant|macro-constant) +([a-zA-Z0-9_]*) *(?:{([^}]*)} *)?(?:([>=<!]+) ([A-Za-z0-9_-]*))?/) { + } elsif (/^(macro|constant|macro-constant|macro-int-constant) +([a-zA-Z0-9_]*) *(?:{([^}]*)} *)?(?:([>=<!]+) ([A-Za-z0-9_-]*))?/) { my($symbol_type) = $1; my($symbol) = $2; my($type) = $3; @@ -432,6 +432,43 @@ while ($#headers >= 0) { $res = $res || $mres || $cres; + if ($symbol_type eq "macro-int-constant" && ($res == 0 || !$optional)) { + # Test that the symbol is usable in #if. + open (TESTFILE, ">$fnamebase.c"); + print TESTFILE "$prepend"; + print TESTFILE "#include <$h>\n"; + print TESTFILE "#if $symbol < 0\n"; + print TESTFILE "# define conformtest_negative 1\n"; + my($s) = "0"; + for (my $i = 0; $i < 63; $i++) { + print TESTFILE "# if $symbol & (1LL << $i)\n"; + print TESTFILE "# define conformtest_bit_$i 0LL\n"; + print TESTFILE "# else\n"; + print TESTFILE "# define conformtest_bit_$i (1LL << $i)\n"; + print TESTFILE "# endif\n"; + $s .= "|conformtest_bit_$i"; + } + print TESTFILE "# define conformtest_value ~($s)\n"; + print TESTFILE "#else\n"; + print TESTFILE "# define conformtest_negative 0\n"; + $s = "0"; + for (my $i = 0; $i < 64; $i++) { + print TESTFILE "# if $symbol & (1ULL << $i)\n"; + print TESTFILE "# define conformtest_bit_$i (1ULL << $i)\n"; + print TESTFILE "# else\n"; + print TESTFILE "# define conformtest_bit_$i 0ULL\n"; + print TESTFILE "# endif\n"; + $s .= "|conformtest_bit_$i"; + } + print TESTFILE "# define conformtest_value ($s)\n"; + print TESTFILE "#endif\n"; + print TESTFILE "int main (void) { return !((($symbol < 0) == conformtest_negative) && ($symbol == conformtest_value)); }\n"; + close (TESTFILE); + + runtest ($fnamebase, "Testing for #if usability of symbol $symbol", + "Symbol \"$symbol\" not usable in #if.", $res); + } + if (defined ($type) && ($res == 0 || !$optional)) { # Test the type of the symbol. open (TESTFILE, ">$fnamebase.c"); @@ -744,7 +781,7 @@ while ($#headers >= 0) { if (/^element *({([^}]*)}|([^ ]*)) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*) *(.*)/) { push @allow, $7; - } elsif (/^(macro|constant|macro-constant) +([a-zA-Z0-9_]*) *(?:{([^}]*)} *)?(?:([>=<!]+) ([A-Za-z0-9_-]*))?/) { + } elsif (/^(macro|constant|macro-constant|macro-int-constant) +([a-zA-Z0-9_]*) *(?:{([^}]*)} *)?(?:([>=<!]+) ([A-Za-z0-9_-]*))?/) { push @allow, $1; } elsif (/^(type|tag) *({([^}]*)|([a-zA-Z0-9_]*))/) { my($type) = "$3$4"; |