From: Stefano Lattarini Date: Sat, 27 Oct 2012 15:08:28 +0000 (+0200) Subject: tests: remove obsolescent references to './defs' X-Git-Tag: v1.12b~43 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55ea5e0f7c8bdff233315f33218351809365a19d;p=platform%2Fupstream%2Fautomake.git tests: remove obsolescent references to './defs' * t/distcom-subdir.sh, t/distcom2.sh, t/ax/depcomp.sh, t/conff2.sh, t/ccnoco3.sh, t/ccnoco.sh, t/self-check-dir.tap, t/self-check-exit.tap, t/self-check-me.tap: Here. Instead, refer to "am-test-lib.sh", "test-init.sh", or simply "the testsuite setup", as appropriate. Signed-off-by: Stefano Lattarini --- diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh index f8e372f..4094a37 100644 --- a/t/ax/depcomp.sh +++ b/t/ax/depcomp.sh @@ -67,7 +67,7 @@ # ------------------------------------------------------------------------- -# This expects ./defs has already been included has already been included.. +# This code expects test-init.sh has already been included in advance. ocwd=$(pwd) || fatal_ "getting current working directory" longpath=this-is/a-path/which-has/quite-a/definitely/truly/long_long_name diff --git a/t/ccnoco.sh b/t/ccnoco.sh index ac30b01..960860c 100755 --- a/t/ccnoco.sh +++ b/t/ccnoco.sh @@ -53,7 +53,8 @@ case " \$* " in ;; esac -# Use '$CC', not 'gcc', to honour the compiler chosen by 't/defs'. +# Use '$CC', not 'gcc', to honour the compiler chosen +# by the testsuite setup. exec $CC "\$@" END diff --git a/t/ccnoco3.sh b/t/ccnoco3.sh index bbe45b6..417f0c1 100755 --- a/t/ccnoco3.sh +++ b/t/ccnoco3.sh @@ -52,7 +52,8 @@ case " \$* " in ;; esac -# Use '$CC', not 'gcc', to honour the compiler chosen by 't/defs'. +# Use '$CC', not 'gcc', to honour the compiler chosen +# by the testsuite setup. exec $CC "\$@" END diff --git a/t/conff2.sh b/t/conff2.sh index 41820ae..9c51849 100755 --- a/t/conff2.sh +++ b/t/conff2.sh @@ -18,8 +18,8 @@ . test-init.sh -# We avoid using configure.ac stub initialized by ./defs, since we need -# to keep track of line numbers (to grep for error messages). +# We avoid using configure.ac stub initialized by our testsuite setup, as +# we need to keep track of line numbers (to grep for error messages). cat > configure.ac << END AC_INIT([$me], [1.0]) AM_INIT_AUTOMAKE diff --git a/t/distcom-subdir.sh b/t/distcom-subdir.sh index c129dea..b0cbf12 100755 --- a/t/distcom-subdir.sh +++ b/t/distcom-subdir.sh @@ -50,7 +50,7 @@ test -f depcomp # FIXME: the logic of this check and other similar ones in other # FIXME: 'distcom*.sh' files should be factored out in a common -# FIXME: subroutine in 'defs'... +# FIXME: subroutine in 'am-test-lib.sh'... sed -n -e " /^DIST_COMMON =.*\\\\$/ { :loop diff --git a/t/distcom2.sh b/t/distcom2.sh index 113a251..1fba523 100755 --- a/t/distcom2.sh +++ b/t/distcom2.sh @@ -52,7 +52,7 @@ for opt in '' --no-force; do for dir in . subdir; do # FIXME: the logic of this check and other similar ones in other # FIXME: 'distcom*.sh' files should be factored out in a common - # FIXME: subroutine in 'defs'... + # FIXME: subroutine in 'am-test-lib.sh'... sed -n -e " /^DIST_COMMON =.*\\\\$/ { :loop diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap index 9ad4010..0dc893d 100755 --- a/t/self-check-dir.tap +++ b/t/self-check-dir.tap @@ -15,9 +15,9 @@ # along with this program. If not, see . # Sanity check for the automake testsuite. -# Check that tests using './defs' create a proper temporary directory, -# and run in it. Also check that we can prevent the pre-population -# and the creation of such directory if we want. +# Check that tests using 'test-init.sh' create a proper temporary +# directory, and run in it. Also check that we can prevent the +# pre-population and the creation of such directory if we want. am_create_testdir=no . test-init.sh diff --git a/t/self-check-exit.tap b/t/self-check-exit.tap index 556badc..14d9e8b 100755 --- a/t/self-check-exit.tap +++ b/t/self-check-exit.tap @@ -16,7 +16,7 @@ # Sanity check for the automake testsuite. # Check that, in case of failing commands, the correct exit status is -# passed to the exit trap installed by the './defs' script. +# passed to the exit trap installed by the 'test-init.sh' script. # Also check that the 'errexit' shell flag is active. am_create_testdir=no @@ -30,14 +30,14 @@ plan_ 32 set +e # It's especially important that the 'unset' is done before sourcing -# ./defs, i.e., when 'set -e' is not active yet, for the benefit of shells -# (like Bash 2.05 and Solaris 10 /bin/ksh) that returns a non-zero status -# when unsetting an already-unset variable. -# Add an extra newline at the end so that the aliases defined by 'defs' -# can take effect. Yes, this is truly required. +# test-init.sh, i.e., when 'set -e' is not active yet, for the benefit +# of shells (like Bash 2.05 and Solaris 10 /bin/ksh) that returns a +# non-zero status when unsetting an already-unset variable. +# Add an extra newline at the end so that the aliases defined by +# test-init.sh can take effect. Yes, this is truly required. init="stderr_fileno_=2; unset am_explicit_skips;. test-init.sh${nl}" -# Required so that the code in defs doesn't go crazy trying to creating a +# Required so that the code in test-init.sh doesn't go crazy trying to creating a # temporary directory in the absolute dir of $AM_TEST_RUNNER_SHELL. dummy_test_script=t/$me.sh diff --git a/t/self-check-me.tap b/t/self-check-me.tap index c76a0e1..6d008b6 100755 --- a/t/self-check-me.tap +++ b/t/self-check-me.tap @@ -15,7 +15,7 @@ # along with this program. If not, see . # Sanity check for the automake testsuite. -# Make sure that $me gets automatically defined by './defs'. +# Make sure that $me gets automatically defined by 'test-init.sh'. am_create_testdir=no . test-init.sh @@ -55,7 +55,7 @@ s=$(me=bad $AM_TEST_RUNNER_SHELL -c ' . test-init.sh echo me=$me ' foo.sh) -command_ok_ "override of \$me before ./defs causes no error" \ +command_ok_ "override of \$me before test-init.sh causes no error" \ test $? -eq 0 r='ok'