summaryrefslogtreecommitdiff
path: root/t/conflnk2.sh
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-10-27 17:52:35 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-10-27 17:52:35 +0200
commit0dd85e069d595f169d2e41c98762a6395632c3fb (patch)
tree1fbd63c3637c851e115dd2cf388beea3bf922f52 /t/conflnk2.sh
parentcf8b865e19c25d5cb5ccb2def3d5d2d8b8c63d32 (diff)
parent9fed1c8186e58ff7b2152e3901d5d62b6d86d9b9 (diff)
downloadautomake-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/conflnk2.sh')
-rwxr-xr-xt/conflnk2.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/conflnk2.sh b/t/conflnk2.sh
index e9d00e0af..8271f38b0 100755
--- a/t/conflnk2.sh
+++ b/t/conflnk2.sh
@@ -17,7 +17,7 @@
# Test to make sure that sources for links created by AC_CONFIG_LINKS
# are distributed.
-. ./defs || exit 1
+. test-init.sh
echo SUBDIRS = sdir > Makefile.am