Hash :
c2a52bf0
Author :
Date :
2012-06-24T10:36:15
tests: simpler workaround for shells losing the exit status in exit trap Now that we can assume our tests are run by a decent POSIX shell, we can simplify our workaround aimed at having the exit status propagated correctly to the code in the exit trap. Unfortunately, we cannot dispense with such a workaround altogether, because it's still required by some shells we need to support (at least Solaris 10 /bin/ksh and /usr/xpg4/bin/sh). For more information about the need of that workaround, see the entry about 'trap' in the section "Limitations of Shell Builtins" in the Autoconf manual: <http://www.gnu.org/software/autoconf/manual/autoconf.html#trap> The new workaround has been tested successfully with the following shells: - Bash 4.1 - Bash 3.2 - Bash 3.0 - Bash 2.05b - dash 0.5.5.1 - dash 0.5.2 - AT&T Ksh 93u (from official Debian package) - MirBSD Korn Shell 40.2 (from official Debian package) - Solaris 9, 10 and 11 /bin/ksh - Solaris 9, 10 and 11 /usr/xpg4/bin/sh - NetBSD 5.1 /bin/sh - NetBSD 5.1 /bin/ksh * t/ax/test-init.sh (Exit): Rename ... (_am_exit): ... like this. (exit): New alias for '_am_exit'. We cannot simply redefine 'exit' as a shell function, because some shells (dash 0.5.5.1, Solaris 10 /bin/ksh and /usr/xpg4/bin/sh) do not allow it. (_am_exit, trap): Add extra escaping for 'exit' calls, to ensure we really invoke the 'exit' builtin and not our alias with the same name. * configure.ac: Check that the shell selected to run our testsuite supports aliases named like shell builtins. * t/REAMDE: Adjust. * All tests: Adjust, by simply using 'exit' instead of 'Exit'. * t/self-check-explicit-skips.sh: Adjust: the first usage of 'exit' after it has been redefined as an alias must be on a new line w.r.t. that where the alias is defined, in order for the redefinition to be honored. * syntax-checks.mk (sc_tests_Exit_not_exit): Delete. (sc_tests_exit_not_Exit): New. (syntax_check_rules): Adjust. (sc_tests_automake_fails): Simplify the recipe a little. * Several tests: Remove now useless spurious quoting once required to placate the 'sc_tests_Exit_not_exit' maintainer check. * gen-testsuite-part: Likewise. Also, avoid uses of 'Exit' in the generated scripts. 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 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124
#! /bin/sh
# Copyright (C) 2011-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/>.
# Test rebuild rules for Java class files.
required='javac'
. ./defs || exit 1
cat >> configure.ac <<'END'
AC_OUTPUT
END
cat > Makefile.am <<'END'
AM_JAVACFLAGS = -verbose
foodir = $(datadir)/java
foo_JAVA = a.java
dist_foo_JAVA = d.java
nodist_foo_JAVA = n.java
nobase_foo_JAVA = Nobase.java
nobase_dist_foo_JAVA = NobaseDist.java
nobase_nodist_foo_JAVA = NobaseNoDist.java
END
echo 'class _x {}' > a.java
echo 'class x_ {}' > d.java
echo 'class a {} class d {}' > n.java
echo 'class Nobase_Foo {} class Nobase_Bar {}' > Nobase.java
echo 'class NobaseDist {}' > NobaseDist.java
echo 'class NobaseNoDist {}' > NobaseNoDist.java
$ACLOCAL
$AUTOCONF
$AUTOMAKE
all_classes='_x x_ a d Nobase_Foo Nobase_Bar NobaseDist NobaseNoDist'
for vpath in : false; do
if $vpath; then
srcdir=..
mkdir build
cd build
else
srcdir=.
fi
$srcdir/configure
$MAKE
ls -l # For debugging.
# Sanity check.
test -f classfoo.stamp
for cls in $all_classes; do
test -f $cls.class
done
# When the stampfile is removed, all the *.class files should
# be considered out-of-date.
echo timestamp > older
$sleep
rm -f classfoo.stamp
$MAKE
for cls in $all_classes; do
is_newest $cls.class older
done
# When only a java file is modified, only the *.class files derived from
# it should be updated.
# The strings we loop on here have the following format:
# "JAVA-FILES-TO-BE-TOUCHED -- CLASSES-THAT-SHOULD-BE-UPDATED"
for args in \
'a -- _x' \
'd -- x_' \
'n -- a d' \
'a d Nobase -- _x x_ Nobase_Foo Nobase_Bar' \
'n NobaseDist -- a d NobaseDist' \
'd NobaseNoDist -- x_ NobaseNoDist' \
"a d n Nobase NobaseDist NobaseNoDist -- $all_classes" \
; do
set $args
touched_javas=
while test $# -gt 0; do
if test x"$1" = x"--"; then
shift
break
else
touched_javas="$touched_javas $1"
shift
fi
done
updated_classes=$*
echo timestamp > older
$sleep
for j in $touched_javas; do
touch $srcdir/$j.java
done
$MAKE
is_newest classfoo.stamp older
for cls in $all_classes; do
case " $updated_classes " in
*" $cls "*) is_newest $cls.class older;;
*) is_newest older $cls.class;;
esac
done
done # $args ...
cd $srcdir
done # $vpath ...
: