diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-10-27 17:52:35 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-10-27 17:52:35 +0200 |
| commit | 0dd85e069d595f169d2e41c98762a6395632c3fb (patch) | |
| tree | 1fbd63c3637c851e115dd2cf388beea3bf922f52 /t/self-check-dir.tap | |
| parent | cf8b865e19c25d5cb5ccb2def3d5d2d8b8c63d32 (diff) | |
| parent | 9fed1c8186e58ff7b2152e3901d5d62b6d86d9b9 (diff) | |
| download | automake-0dd85e069d595f169d2e41c98762a6395632c3fb.tar.gz | |
Merge branch 'master' into ng/master
* master:
tests: remove spurious leftover use of 'Exit'
tests: remove an obsolete, and probably now wrong, comment
tests: remove obsolescent references to './defs'
tests: prefer including 'test-init.sh' rather than './defs'
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/self-check-dir.tap')
| -rwxr-xr-x | t/self-check-dir.tap | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap index 48dbc0ebf..60d921635 100755 --- a/t/self-check-dir.tap +++ b/t/self-check-dir.tap @@ -15,12 +15,12 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # 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 -. ./defs || exit 99 +. test-init.sh plan_ 5 @@ -37,7 +37,7 @@ do_check () rm -rf _self.dir || framework_failure_ "cleaning up _self.dir" command_ok_ "$1 [$2]" $AM_TEST_RUNNER_SHELL -c " $2 - . ./defs || exit 99 + . test-init.sh # Don't fail if 'ls -l' fails; avoids possible racy spurious failures. pwd; ls -l || : # For debugging. $3 |