aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-25 02:57:58 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-25 02:57:58 +0000
commitd753ffefe56232dcd74ee5344ed2cf04c03fed29 (patch)
tree9db35147a93ed49eca7ed6cec99666686bb68df5
parent19533127701e664536aa1eea65d278dbab0ee97e (diff)
downloadglibc-d753ffefe56232dcd74ee5344ed2cf04c03fed29.zip
glibc-d753ffefe56232dcd74ee5344ed2cf04c03fed29.tar.gz
glibc-d753ffefe56232dcd74ee5344ed2cf04c03fed29.tar.bz2
Update.
* conform/conformtest.pl: Handle allow-header correctly. * conform/data/time.h-data: Use correct comment form.
-rw-r--r--ChangeLog4
-rw-r--r--conform/conformtest.pl13
-rw-r--r--conform/data/time.h-data2
3 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index ccf5d98..2092e99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2001-01-24 Ulrich Drepper <drepper@redhat.com>
+ * conform/conformtest.pl: Handle allow-header correctly.
+
+ * conform/data/time.h-data: Use correct comment form.
+
* conform/conformtest.pl (checknamespace): Ignore #undef lines.
* configure.in: Comment out binutils version test.
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index 536dbd7..e98975b 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -22,8 +22,6 @@ $CFLAGS = "-I. '-D__attribute__(x)=' -D_XOPEN_SOURCE=500";
"dlfcn.h", "dirent.h", "ctype.h", "cpio.h", "assert.h",
"arpa/inet.h", "aio.h");
-@headers = ("aio.h");
-
# These are the ISO C99 keywords.
@keywords = ('auto', 'break', 'case', 'char', 'const', 'continue', 'default',
'do', 'double', 'else', 'enum', 'extern', 'float', 'for', 'goto',
@@ -214,7 +212,7 @@ sub checknamespace {
print TESTFILE "#include <$h>\n";
close (TESTFILE);
- open (CONTENT, "$CC $CFLAGS -E $fnamebase.c -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 (<CONTENT>) {
next loop if (/^#undef /);
chop;
@@ -652,14 +650,14 @@ while ($#headers >= 0) {
compiletest ($fnamebase, "Test availability of macro $macro",
"Macro \"$macro\" is not available.", $missing);
- } elsif (/^allow *(.*)/) {
- my($pattern) = $1;
- push @allow, $pattern;
- next control;
} elsif (/^allow-header *(.*)/) {
my($pattern) = $1;
push @allowheader, $pattern;
next control;
+ } elsif (/^allow *(.*)/) {
+ my($pattern) = $1;
+ push @allow, $pattern;
+ next control;
} else {
# printf ("line is `%s'\n", $_);
next control;
@@ -708,6 +706,7 @@ while ($#headers >= 0) {
} elsif (/^allow *(.*)/) {
push @allow, $1;
} elsif (/^allow-header *(.*)/) {
+ # XXX We should have a test for recursive dependencies here.
push @allowheader, $1;
}
}
diff --git a/conform/data/time.h-data b/conform/data/time.h-data
index 7284760..e0b91f3 100644
--- a/conform/data/time.h-data
+++ b/conform/data/time.h-data
@@ -68,7 +68,7 @@ function void tzset (void)
variable int daylight
variable {long int} timezone
-# variable {char*} tzname []
+// variable {char*} tzname []
allow tm_*
allow clock_*