[SCM] GNU Autoconf source repository branch, master, updated. v2.63b-8-g1c34e51

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=1c34e5113f6b28370cec6a5d8ffe605bd67d4fde

The branch, master has been updated
       via  1c34e5113f6b28370cec6a5d8ffe605bd67d4fde (commit)
       via  bd671cbd57c759087b3f3d4c0b3d4c056712063a (commit)
      from  fc5c85a6b288df184081051c45a0569e1e8fcae2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1c34e5113f6b28370cec6a5d8ffe605bd67d4fde
Author: Eric Blake <address@hidden>
Date:   Thu Apr 9 11:13:51 2009 -0600

    Avoid problems caused by deleting in-use directory.
    
    * lib/autotest/general.m4 (AT_INIT) <at_fn_group_prepare>: Only
    remove the contents of $at_group_dir, not the directory itself.
    
    Signed-off-by: Eric Blake <address@hidden>

commit bd671cbd57c759087b3f3d4c0b3d4c056712063a
Author: Eric Blake <address@hidden>
Date:   Thu Apr 9 10:29:33 2009 -0600

    Fix regression in empty test.
    
    * lib/autotest/general.m4 (AT_SETUP): Prep AT_ingroup for fallback
    use in empty test.  Fixes regression introduced 2009-04-06.
    (_AT_CHECK): Undo fallback when a test is not empty.
    (AT_CLEANUP): Expand AT_ingroup before deleting.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   12 ++++++++++++
 lib/autotest/general.m4 |   15 ++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9bd856..be9ab98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-04-09  Eric Blake  <address@hidden>
+
+       Avoid problems caused by deleting in-use directory.
+       * lib/autotest/general.m4 (AT_INIT) <at_fn_group_prepare>: Only
+       remove the contents of $at_group_dir, not the directory itself.
+
+       Fix regression in empty test.
+       * lib/autotest/general.m4 (AT_SETUP): Prep AT_ingroup for fallback
+       use in empty test.  Fixes regression introduced 2009-04-06.
+       (_AT_CHECK): Undo fallback when a test is not empty.
+       (AT_CLEANUP): Expand AT_ingroup before deleting.
+
 2009-04-09  Paolo Bonzini  <address@hidden>
 
        Make a less conservative cross-compilation guess for AC_FUNC_UTIME_NULL.
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 11a067c..9c6538e 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -999,8 +999,7 @@ m4_divert_pop([PREPARE_TESTS])dnl
 m4_divert_push([TESTS])dnl
 
 # Create the master directory if it doesn't already exist.
-test -d "$at_suite_dir" ||
-  mkdir "$at_suite_dir" ||
+AS_MKDIR_P(["$at_suite_dir"]) ||
   AS_ERROR([cannot create `$at_suite_dir'])
 
 # Can we diff with `/dev/null'?  DU 5.0 refuses.
@@ -1094,11 +1093,15 @@ at_fn_group_prepare ()
   _AT_NORMALIZE_TEST_GROUP_NUMBER(at_group_normalized)
 
   # Create a fresh directory for the next test group, and enter.
+  # If one already exists, the user may have invoked ./run from
+  # within that directory; we remove the contents, but not the
+  # directory itself, so that we aren't pulling the rug out from
+  # under the shell's notion of the current directory.
   at_group_dir=$at_suite_dir/$at_group_normalized
   at_group_log=$at_group_dir/$as_me.log
   if test -d "$at_group_dir"; then
     find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
-    rm -fr "$at_group_dir" ||
+    rm -fr "$at_group_dir"/* "$at_group_dir"/.[!.] "$at_group_dir"/.??* ||
     AS_WARN([test directory for $at_group_normalized could not be cleaned.])
   fi
   # Be tolerant if the above `rm' was not able to remove the directory.
@@ -1738,7 +1741,8 @@ m4_define([AT_COPYRIGHT],
 # The group is testing what DESCRIPTION says.
 _AT_DEFINE_INIT([AT_SETUP],
 [m4_ifdef([AT_ingroup], [m4_fatal([$0: nested AT_SETUP detected])],
-  [m4_define([AT_ingroup])])
+  [m4_define([AT_ingroup], [AS_ECHO(["$at_setup_line"]) >"$at_check_line_file"
+])])
 m4_ifdef([AT_keywords], [m4_undefine([AT_keywords])])
 m4_define([AT_capture_files], [])
 m4_define([AT_line], AT_LINE)
@@ -1799,7 +1803,7 @@ _AT_DEFINE_SETUP([AT_CAPTURE_FILE],
 # ----------
 # Complete a group of related tests.
 _AT_DEFINE_INIT([AT_CLEANUP],
-[m4_ifdef([AT_ingroup], [m4_undefine([AT_ingroup])],
+[m4_ifdef([AT_ingroup], [AT_ingroup[]_m4_undefine([AT_ingroup])],
   [m4_fatal([$0: missing AT_SETUP detected])])dnl
 m4_append([AT_help_all],
 m4_defn([AT_ordinal]);m4_defn([AT_line]);m4_defn([AT_description]);dnl
@@ -2058,6 +2062,7 @@ m4_define([AT_DIFF_STDOUT()],
 # output from multiple concurrent processes, e.g., an inner testsuite
 # with parallel jobs.
 m4_define([_AT_CHECK],
+[m4_define([AT_ingroup])]dnl
 [{ $at_traceoff
 AS_ECHO(["$at_srcdir/AT_LINE: AS_ESCAPE([[$1]])"])
 _AT_DECIDE_TRACEABLE([$1]) "AS_ESCAPE(m4_dquote(AT_LINE))"


hooks/post-receive
--
GNU Autoconf source repository