Fix spurious conform test failures

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e202c4bf9..2ebbeb6f87 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 a8a27f5d2a..cc0944a889 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);