FYI: 13AT_KEYWORDS-without-commas.diff

[derek]

This is almost the same as the 11AT_KEYWORDS-without-commas.diff that Akim
already approved, except that I needed to update the at_prev handling which was
dependent on my 07AT_ARG_OPTION.diff and I caught an error in my grep which was
excluding matches to the description field.

Index: ChangeLog
2003-04-29  Derek Price  <address@hidden>

        * lib/autotest/general.m4 (AT_KEYWORDS): Don't use a comma as the
        seperator with m4_append_uniq().  It doesn't work.
        (AT_CLEANUP): Add `;' to end of at_help_all.
        (AT_INIT): Allow --keywords to be specified more than once.  When
        grepping $at_help_all for keywords, use the field and keyword
        seperators to ensure a complete keyword match.  Alter at_prev handling
        to support the new --keywords behavior.

Index: lib/autotest/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autotest/general.m4,v
retrieving revision 1.141
diff -u -r1.141 general.m4
--- lib/autotest/general.m4     31 Mar 2003 20:25:52 -0000      1.141
+++ lib/autotest/general.m4     29 Apr 2003 20:47:37 -0000
@@ -214,9 +214,8 @@
 do
   # If the previous option needs an argument, assign it.
   if test -n "$at_prev"; then
-    eval "$at_prev=\$at_option"
+    at_option=$at_prev=$at_option
     at_prev=
-    continue
   fi
 
   at_optarg=`expr "x$at_option" : 'x[[^=]]*=\(.*\)'`
@@ -295,10 +294,10 @@
 
     # Keywords.
     --keywords | -k )
-       at_prev=at_keywords
+       at_prev=--keywords
        ;;
     --keywords=* )
-       at_keywords=$at_optarg
+       at_keywords="$at_keywords,$at_optarg"
        ;;
 m4_divert_pop([PARSE_ARGS])dnl
 dnl Process *=* last to allow for user specified --option=* type arguments.
@@ -330,7 +329,7 @@
   do
     # It is on purpose that we match the test group titles too.
     at_groups_selected=`echo "$at_groups_selected" |
-                       grep -i "^[[^;]]*;[[^;]]*;.*$at_keyword"`
+                       grep -i "^[[^;]]*;[[^;]]*.*[[; ]]$at_keyword[[ ;]]"`
   done
   at_groups_selected=`echo "$at_groups_selected" | sed 's/;.*//'`
   # Smash the end of lines.
@@ -802,7 +801,7 @@
 # ---------------------
 # Declare a list of keywords associated to the current test group.
 m4_define([AT_KEYWORDS],
-[m4_append_uniq([AT_keywords], [$1], [,])])
+[m4_append_uniq([AT_keywords], [$1], [ ])])
 
 
 # AT_CLEANUP
@@ -810,7 +809,7 @@
 # Complete a group of related tests.
 m4_define([AT_CLEANUP],
 [m4_append([AT_help],
-at_help_all=$at_help_all'm4_defn([AT_ordinal]);m4_defn([AT_line]);m4_defn([AT_description]);m4_ifdef([AT_keywords],
 [m4_defn([AT_keywords])])
+at_help_all=$at_help_all'm4_defn([AT_ordinal]);m4_defn([AT_line]);m4_defn([AT_description]);m4_ifdef([AT_keywords],
 [m4_defn([AT_keywords])]);
 '
 )dnl
     $at_times_skip || times >$at_times_file