* t/ax/tests-init.sh ($testSubDir): Rename ... ($am_test_subdir): ... to this, throughout the file.
Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- t/ax/test-init.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh index b572109..990f5c9 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,20 +977,20 @@ 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/} - testSubDir=${testSubDir%/*}/$me.dir - test ! -e $testSubDir || rm_rf_ $testSubDir \ + am_test_subdir=${argv0#$am_rel_srcdir/} + am_test_subdir=${am_test_subdir%/*}/$me.dir + 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 \ -- 1.7.9.5