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 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179
#! /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/>.
# Demo on C support, also testing automatic dependency tracking,
# conditional SUBDIRS and convenience libraries.
required=cc
am_create_testdir=empty
. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([GNU C Demo], [22.3.2], [bug-automake@gnu.org])
AC_CONFIG_SRCDIR([tests/test.test])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
AC_PROG_CC
AM_PROG_CC_C_O
AM_PROG_AR
AC_PROG_RANLIB
AM_CONDITIONAL([RUN_TESTS], [test x"$run_tests" != x"no"])
AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile tests/Makefile])
AC_OUTPUT
END
if cross_compiling; then
run_tests=no
else
run_tests=yes
fi
export run_tests
mkdir build-aux lib src tests
cat > Makefile.am <<'END'
SUBDIRS = lib src
if RUN_TESTS
SUBDIRS += tests
endif
.PHONY: test-objs
check-local: test-objs
test-objs:
test -f src/zardoz-main.$(OBJEXT)
test -f lib/foo.$(OBJEXT)
test -f lib/bar.$(OBJEXT)
END
cat > src/Makefile.am << 'END'
bin_PROGRAMS = zardoz
zardoz_SOURCES = main.c
zardoz_LDADD = $(top_builddir)/lib/lib-convenience.a
zardoz_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
END
cat > lib/Makefile.am << 'END'
noinst_LIBRARIES = lib-convenience.a
lib_convenience_a_SOURCES = foo.c
lib_convenience_a_SOURCES += bar.c
dist_lib_convenience_a_SOURCES = bar.h
nodist_lib_convenience_a_SOURCES = foo.h
# We want this to be auto-generated an removed by "make clean", to
# ensure that cleaning rules work correctly; an older implementation
# of automatic dependency tracking support suffered of weaknesses in
# this situation, see the "historical comments" reported in:
# http://lists.gnu.org/archive/html/automake-patches/2012-06/msg00033.html
foo.h: $(srcdir)/foo.c
sed -n 's/.*foo *(.*/&;/p' "$(srcdir)/foo.c" >$@-t
test 1 -eq `wc -l <$@-t`
chmod a-w $@-t && mv -f $@-t $@
BUILT_SOURCES = foo.h
CLEANFILES = $(BUILT_SOURCES)
check-local:
test -f ${top_srcdir}/tests/test.test
END
cat > tests/Makefile.am << 'END'
AUTOMAKE_OPTIONS = parallel-tests
TEST_LOG_COMPILER = $(SHELL)
TESTS = test.test
EXTRA_DIST = $(TESTS)
END
cat > tests/test.test << 'END'
#!/bin/sh
set -x; set -e;
../src/zardoz
test "`../src/zardoz`" = 'Foo, Bar!'
END
$ACLOCAL
$AUTOCONF
$AUTOMAKE --add-missing
test -f build-aux/depcomp
test -f build-aux/compile # We have per-target flags on C sources.
# Don't reject slow dependency extractors.
./configure --enable-dependency-tracking
cat > src/main.c << 'END'
#include "foo.h"
#include "bar.h"
int main (void)
{
printf ("%s, %s!\n", foo (), bar ());
return 0;
}
END
cat > lib/foo.c << 'END'
#include "foo.h"
static char s[4];
volatile char *foo (void)
{
s[0] = 'F';
s[1] = s[2] = 'o';
s[3] = '\0';
return s;
}
END
cat > lib/bar.c << 'END'
#include "bar.h"
const char *bar (void)
{
return BARBAR;
}
END
cat > lib/bar.h << 'END'
#define BARBAR "Bar"
const char *bar (void);
END
$MAKE
ls -l . src lib # For debugging.
$MAKE test-objs
VERBOSE=x $MAKE check
if cross_compiling; then
test ! -f tests/test-suite.log
test ! -f tests/test.log
else
test -f tests/test-suite.log
grep 'Foo, Bar!' tests/test.log
fi
$MAKE distcheck
if ! cross_compiling && ! grep "[ $tab]depmode=none" Makefile; then
# Let's check automatic dependency tracking.
sed 's/^\(#define BARBAR \).*/\1 "Zap"/' lib/bar.h > t
mv -f t lib/bar.h
$MAKE
./src/zardoz
test "$(./src/zardoz)" = 'Foo, Zap!'
fi
$MAKE clean
test ! -f lib/foo.h
test -f lib/bar.h
: