* lib/autotest/general.m4 (AT_INIT): When handling --keywords, be

sure not to introduce newlines in at_groups.
* lib/autotest/Makefile.am (autotest.m4f): Typo.

diff --git a/ChangeLog b/ChangeLog
index 0c0e5aa12cfa791a4824b2167447ef6ebdc97758..fb8dac891d905d4ae146f9e48db315e391a7f2e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-06  Akim Demaille  <akim@epita.fr>
+
+       * lib/autotest/general.m4 (AT_INIT): When handling --keywords, be
+       sure not to introduce newlines in at_groups.
+       * lib/autotest/Makefile.am (autotest.m4f): Typo.
+
 2002-02-06  Akim Demaille  <akim@epita.fr>
 
        * tests/torture.at (Configuring subdirectories): Skip if aclocal

diff --git a/lib/autotest/Makefile.am b/lib/autotest/Makefile.am
index 73ef2c3ef76775c7d8b00957b6113d8e94c31081..80db80292e3f370ffa441f0e63fba4c6f4703d3a 100644 (file)
--- a/lib/autotest/Makefile.am
+++ b/lib/autotest/Makefile.am
@@ -52,5 +52,5 @@ check-local:
 ## The frozen files.  ##
 ## ------------------ ##
 
-autotest.m4f: $(autotests_m4f_dependencies)
+autotest.m4f: $(autotest_m4f_dependencies)
 include ../freeze.mk

diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in
index 0cc40aa5b15b5991db343653a44df81bbf3d305c..1983023778cdef86085b68d774457d4e34758fd6 100644 (file)
--- a/lib/autotest/Makefile.in
+++ b/lib/autotest/Makefile.in
@@ -347,7 +347,7 @@ check-local:
          rm -f eof.log; \
        fi
 
-autotest.m4f: $(autotests_m4f_dependencies)
+autotest.m4f: $(autotest_m4f_dependencies)
 $(AUTOM4TE):
        cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) autom4te
 $(AUTOM4TE_CFG):

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 646d23bc21a583706ea6dd02511ebe100f933dcd..5f651caacb198439bc2dd3b2d2103705108c4932 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -252,6 +252,8 @@ while test $[@%:@] -gt 0; do
                              egrep -i "^[[^;]]*;[[^;]]*;.*$at_keyword"`
         done
         at_groups_selected=`echo "$at_groups_selected" | sed 's/;.*//'`
+       # Smash the end of lines.
+       at_groups_selected=`echo $at_groups_selected`
         at_groups="$at_groups$at_groups_selected "
         ;;
 
@@ -329,7 +331,7 @@ AT_TESTSUITE_NAME test groups:
       KEYWORDS
 
 _ATEOF
-  # "  1 42  45 " => "^(1|42|45);"
+  # "  1 42  45 " => "^(1|42|45);".
   at_groups_pattern=`echo "$at_groups" | sed 's/^  *//;s/  *$//;s/  */|/g'`
   at_groups_pattern="^(${at_groups_pattern});"
   echo "$at_help_all" |