Hash :
5ddf1007
Author :
Date :
2012-10-27T16:41:39
tests: prefer including 'test-init.sh' rather than './defs'
This is a follow-up to today's commit v1.12.4-22-g0610fc8,
"tests: prepare to move ./defs to t/ax/test-init.sh"
* All tests: To run the common setup, use the command:
. test-init.sh
instead of the older, "historical" one:
. ./defs || exit 1
Note that the "|| exit 1" wasn't really useful, since the 'errexit'
shell flag is in effect in both './defs' and 'test-init.sh', and all
the known shells that are good enough to run the automake testsuite
do automatically exit with error when a sourced file cannot be found
(at least, they do so in non-interactive mode, which is the only
mode that concerns us in the testsuite).
* t/ax/tap-summary-aux.sh, t/ax/testsuite-summary-checks.sh: Likewise.
* gen-testsuite-part: Do the same in the generated tests.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
#! /bin/sh
# Copyright (C) 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check compiling elisp files in different subdirectories, where a
# file in a subdirectory might require a file in another one.
# This doesn't work out of the box, but can be made to work with a
# judicious use of $(AM_ELCFLAGS).
required=emacs
. test-init.sh
cat >> configure.ac << 'END'
AM_PATH_LISPDIR
AC_OUTPUT
END
cat > Makefile.am << 'END'
dist_lisp_LISP = \
am-here.el \
sub1/am-one.el \
sub2/am-two.el \
sub3/subsub/am-three.el
AM_ELCFLAGS = \
-L $(srcdir)/sub1 \
-L $(srcdir)/sub2 \
-L $(srcdir)/sub3/subsub
elc-test:
test -f sub1/am-one.elc
test -f sub2/am-two.elc
test -f sub3/subsub/am-three.elc
.PHONY: elc-test
check-local: elc-test
END
mkdir sub1 sub2 sub3 sub3/subsub
cat > am-here.el << 'END'
(provide 'am-here)
(require 'am-one)
(require 'am-two)
(require 'am-three)
END
cat > sub1/am-one.el << 'END'
(require 'am-here)
(provide 'am-one)
(require 'am-two)
(require 'am-three)
END
cat > sub2/am-two.el << 'END'
(require 'am-here)
(require 'am-one)
(provide 'am-two)
(require 'am-three)
END
cat > sub3/subsub/am-three.el << 'END'
(require 'am-here)
(require 'am-one)
(require 'am-two)
(provide 'am-three)
END
$ACLOCAL
$AUTOCONF
$AUTOMAKE --add-missing
./configure
$MAKE
$MAKE elc-test
$MAKE clean
for x in am-here sub1/am-one sub2/am-two sub3/subsub/am-three; do
test -f $x.el
test ! -e $x.elc
done
$MAKE distcheck
: