aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2015-07-27 16:04:40 +0200
committerAndreas Schwab <schwab@suse.de>2015-07-27 16:13:55 +0200
commitfddb87425a25aeb6e937496c4952c9bf3d8bb673 (patch)
tree714cbd3905bdc428ed90abfb53cc34c7e431918f
parentae5eae7cfc9c4a8297ff82ec6b794faca1976ecc (diff)
downloadglibc-fddb87425a25aeb6e937496c4952c9bf3d8bb673.zip
glibc-fddb87425a25aeb6e937496c4952c9bf3d8bb673.tar.gz
glibc-fddb87425a25aeb6e937496c4952c9bf3d8bb673.tar.bz2
Fix spurious conform test failures
-rw-r--r--ChangeLog5
-rw-r--r--conform/conformtest.pl3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e202c4..2ebbeb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-27 Andreas Schwab <schwab@suse.de>
+
+ * conform/conformtest.pl (checknamespace): Filter out string
+ literals while tokenizing.
+
2015-07-26 Chung-Lin Tang <cltang@codesourcery.com>
* sysdeps/nios2/dl-sysdep.h (DL_EXTERN_PROTECTED_DATA): Define.
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index a8a27f5..cc0944a 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -275,9 +275,8 @@ sub checknamespace {
} else {
# We have to tokenize the line.
my($str) = $_;
- my($index) = 0;
- my($len) = length ($str);
+ $str =~ s/"[^"]*"//g;
foreach $token (split(/[^a-zA-Z0-9_]/, $str)) {
if ($token ne "") {
newtoken ($token, @allow);