From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 1 Jul 2012 09:01:02 +0000 (+0200)
Subject: tests setup: more namespace safeness
X-Git-Tag: v1.12.2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=285eed2fadec7f8949f10d60ef138c56e25ac565;p=thirdparty%2Fautomake.git

tests setup: more namespace safeness

* t/ax/tests-init.sh ($testSubDir): Rename ...
($am_test_subdir): ... to this, throughout the file.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh
index d798d6cc5..c6d2abdb4 100644
--- a/t/ax/test-init.sh
+++ b/t/ax/test-init.sh
@@ -942,7 +942,7 @@ trap 'exit_status=$?
     esac
     test $exit_status -eq 0 || keep_testdirs=yes
   fi
-  am_keeping_testdirs || rm_rf_ $testSubDir
+  am_keeping_testdirs || rm_rf_ $am_test_subdir
   set +x
   echo "$me: exit $exit_status"
   # Spurious escaping to ensure we do not call our "exit" alias.
@@ -977,23 +977,23 @@ trap "trap '' 13; fatal_ 'caught signal SIGPIPE'" 13
 
 # Create and populate the temporary directory, if and as required.
 if test x"$am_create_testdir" = x"no"; then
-  testSubDir=
+  am_test_subdir=
 else
   # The subdirectory where the current test script will run and write its
   # temporary/data files.  This will be created shortly, and will be removed
   # by the cleanup trap below if the test passes.  If the test doesn't pass,
   # this directory will be kept, to facilitate debugging.
-  testSubDir=${argv0#$am_rel_srcdir/}
-  case $testSubDir in
-    */*) testSubDir=${testSubDir%/*}/$me.dir;;
-      *) testSubDir=$me.dir;;
+  am_test_subdir=${argv0#$am_rel_srcdir/}
+  case $am_test_subdir in
+    */*) am_test_subdir=${am_test_subdir%/*}/$me.dir;;
+      *) am_test_subdir=$me.dir;;
   esac
-  test ! -e $testSubDir || rm_rf_ $testSubDir \
+  test ! -e $am_test_subdir || rm_rf_ $am_test_subdir \
     || framework_failure_ "removing old test subdirectory"
-  $MKDIR_P $testSubDir \
+  $MKDIR_P $am_test_subdir \
     || framework_failure_ "creating test subdirectory"
   # The leading './' is to avoid CDPATH issues.
-  cd ./$testSubDir \
+  cd ./$am_test_subdir \
     || framework_failure_ "cannot chdir into test subdirectory"
   if test x"$am_create_testdir" != x"empty"; then
     cp "$am_scriptdir"/install-sh "$am_scriptdir"/missing \