aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-26 08:46:20 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-26 08:46:20 +0000
commit7cc9fcf4fdd08ab7452b5f73ecae8f9f67ae8061 (patch)
treed61279ddfbc4411157f03ee75a3ca94db36aa2a4
parentaaca79eb56dda98cc5ae2a2a001ef138ac439f73 (diff)
downloadglibc-7cc9fcf4fdd08ab7452b5f73ecae8f9f67ae8061.zip
glibc-7cc9fcf4fdd08ab7452b5f73ecae8f9f67ae8061.tar.gz
glibc-7cc9fcf4fdd08ab7452b5f73ecae8f9f67ae8061.tar.bz2
Update.
* conform/conformtest.pl: Fix handling of macro-str.
-rw-r--r--ChangeLog2
-rw-r--r--conform/conformtest.pl4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8783f6b..5a8a2ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2001-01-26 Ulrich Drepper <drepper@redhat.com>
+ * conform/conformtest.pl: Fix handling of macro-str.
+
* conform/data/inttypes.h-data: Add missing definition and all of
stdint.h-data.
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index 69dcf7f..6aade40 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -694,7 +694,7 @@ while ($#headers >= 0) {
compiletest ($fnamebase, "Test for type of function $fname",
"Function \"$fname\" has incorrect type.", $res, 0);
- } elsif (/^macro-str *([^ ]*)\s*(\".*\")/) {
+ } elsif (/^macro-str *([^ ]*) *(\".*\")/) {
# The above regex doesn't handle a \" in a string.
my($macro) = "$1";
my($string) = "$2";
@@ -721,7 +721,7 @@ while ($#headers >= 0) {
print TESTFILE "#include <$h>\n";
# We can't include <string.h> here.
print TESTFILE "extern int (strcmp)(const char *, const char *);\n";
- print TESTFILE "int main (void) { return strcmp ($macro, $string) != 0;}\n";
+ print TESTFILE "int main (void) { return (strcmp) ($macro, $string) != 0;}\n";
close (TESTFILE);
$res = runtest ($fnamebase, "Testing for value of macro $macro",