Fix spurious conform test failures

diff --git a/ChangeLog b/ChangeLog
index 3e202c4bf99e6ea13da636ba9105d5020c97148b..2ebbeb6f877a134c493cbd0d74a7b041749182e1 100644 (file)
--- 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 a8a27f5d2a3af3a35b8eb80f462a34ced0b9524f..cc0944a889dcbdc3770ca0ffdec132d855c0ffd4 100644 (file)
--- 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);