Tests defs: don't let useless variables leak in test scripts.

* tests/defs ($priv_check_temp, $overwrite_status, $ro_dir_temp,
$create_status, $r2h, $libtool_found, $gettext_found, $aclocaldir,
$extra_includes): Unset once they've served their purpose.

diff --git a/ChangeLog b/ChangeLog
index 2ea4caa7b0041a39e6392bf71883960c2fff2359..6001d6962d6fabfd8bcefdcfe81ca2204bda1191 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       Tests defs: don't let useless variables leak in test scripts.
+       * tests/defs ($priv_check_temp, $overwrite_status, $ro_dir_temp,
+       $create_status, $r2h, $libtool_found, $gettext_found, $aclocaldir,
+       $extra_includes): Unset once they've served their purpose.
+
 2010-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Fix parallel testsuite run with Zsh.

diff --git a/tests/defs b/tests/defs
index f04a7560a1a8ccb6d333f925e2b1ec127c9b7d6d..6a5c7afd63d4f8fb2aa242f938b5a990d56bd1a1 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -1,7 +1,8 @@
 # -*- shell-script -*-
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -237,6 +238,7 @@ do
         echo "$me: cannot drop file write permissions" >&2
         exit 77
       fi
+      unset priv_check_temp overwrite_status
       ;;
     perl-threads)
       if test "$WANT_NO_THREADS" = "yes"; then
@@ -262,6 +264,7 @@ do
         echo "$me: cannot drop directory write permissions" >&2
         exit 77
       fi
+      unset ro_dir_temp create_status
       ;;
     rst2html)
       # Try the variants that are tried in check.am.
@@ -273,6 +276,7 @@ do
         echo "$me: no proper rst2html program found" >&2
         exit 77
       done
+      unset r2h
       ;;
     runtest)
       # DejaGnu's runtest program. We rely on being able to specify
@@ -392,6 +396,8 @@ case " $required " in
         ;;
     esac
     ACLOCAL="$ACLOCAL -Wno-syntax -I $top_testsrcdir/m4 $extra_includes -I $aclocaldir"
+    unset libtool_found gettext_found
+    unset extra_includes aclocaldir
     ;;
 esac