Whitespace cleanup.

* lib/autotest/general.m4 (_AT_CREATE_DEBUGGING_SCRIPT): Avoid
leading whitespace, as it caused space-tab in testsuite.
(AT_INIT): Avoid trailing newlines in testsuite.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 925c10099ddc04ba5e2c812fa43ff90913874dc2..ed77090b7cbde0778c4cb85b2336f0fc823eac2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-10-04  Eric Blake  <ebb9@byu.net>
 
+       Whitespace cleanup.
+       * lib/autotest/general.m4 (_AT_CREATE_DEBUGGING_SCRIPT): Avoid
+       leading whitespace, as it caused space-tab in testsuite.
+       (AT_INIT): Avoid trailing newlines in testsuite.
+
        One more round of m4_foreach_w speedups.
        * lib/m4sugar/m4sugar.m4 (m4_flatten): Only use regex if newline
        is present.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 31038a1acdb0fbea4302647aff7e917bb62a2914..b55741dd39a0f5e72607fd932771fd077f5efda9 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -176,7 +176,7 @@ m4_define([_AT_NORMALIZE_TEST_GROUP_NUMBER],
 # Create the debugging script $at_group_dir/run which will reproduce the
 # current test group.
 m4_define([_AT_CREATE_DEBUGGING_SCRIPT],
-[        {
+[{
            echo "#! /bin/sh"
            echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"$[@]"}'\''='\''"$[@]"'\'''
            AS_ECHO(["cd '$at_dir'"])
@@ -198,14 +198,14 @@ m4_define([AT_ordinal], 0)
 m4_define([AT_banner_ordinal], 0)
 m4_define([AT_groups_all], [])
 m4_define([AT_help_all], [])
-AS_INIT
+AS_INIT[]dnl
+m4_divert_push([DEFAULTS])dnl
 AT_COPYRIGHT(
 [Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
 Foundation, Inc.
 This test suite is free software; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.])
 AS_PREPARE
-m4_divert_push([DEFAULTS])dnl
 
 SHELL=${CONFIG_SHELL-/bin/sh}
 
@@ -517,15 +517,16 @@ m4_divert_pop([HELP_MODES])dnl
 m4_divert_push([HELP_TUNING])dnl
 cat <<_ATEOF
 
+dnl extra quoting prevents emacs whitespace mode from putting tabs in output
 Execution tuning:
   -k, --keywords=KEYWORDS
-                 select the tests matching all the comma-separated KEYWORDS
-                 multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
+[                 select the tests matching all the comma-separated KEYWORDS]
+[                 multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD]
   -e, --errexit  abort as soon as a test fails; implies --debug
   -v, --verbose  force more detailed output
-                 default for debugging scripts
+[                 default for debugging scripts]
   -d, --debug    inhibit clean up and top-level logging
-                 default for debugging scripts
+[                 default for debugging scripts]
   -x, --trace    enable tests shell tracing
 _ATEOF
 m4_divert_pop([HELP_TUNING])dnl
@@ -998,10 +999,10 @@ else
       echo
       for at_group in $at_fail_list
       do
-        at_group_normalized=$at_group
-        _AT_NORMALIZE_TEST_GROUP_NUMBER(at_group_normalized)
-        cat "$at_suite_dir/$at_group_normalized/$as_me.log"
-        echo
+       at_group_normalized=$at_group
+       _AT_NORMALIZE_TEST_GROUP_NUMBER(at_group_normalized)
+       cat "$at_suite_dir/$at_group_normalized/$as_me.log"
+       echo
       done
       echo
     fi