Tag
Hash :
41649edb
Author :
Date :
2003-07-03T18:58:50
* Makefile.am (maintainer-clean): Disallow '$AUTOMAKE && exit 1'. Ignore @...@ substitutions in comments. * tests/defs.in: Try to make the shell more POSIX compliant. (AUTOMAKE_run, AUTOMAKE_fails): New functions. * tests/README: Mention AUTOMAKE_fails. * tests/alloca.test, tests/alloca2.test, tests/ansi8.test, * tests/asm.test, tests/backsl3.test, tests/backsl4.test, * tests/badline.test, tests/badopt.test, tests/canon.test, * tests/canon5.test, tests/colneq.test, tests/comment3.test, * tests/comment5.test, tests/cond2.test, tests/cond20.test, * tests/cond23.test, tests/cond24.test, tests/cond27.test, * tests/condinc2.test, tests/conff2.test, tests/cxx2.test, * tests/dejagnu2.test, tests/dirforbid.test, * tests/distcom3.test, tests/else.test, tests/exdir2.test, * tests/exeext2.test, tests/gcj2.test, tests/gcj5.test, * tests/getopt.test, tests/gettext.test, tests/gettext2.test, * tests/gnits.test, tests/gnuwarn.test, tests/gnuwarn2.test, * tests/insh.test, tests/lex2.test, tests/libobj10.test, * tests/libobj12.test, tests/libobj13.test, * tests/libobj3.test, tests/library2.test, * tests/library3.test, tests/libtool4.test, * tests/libtool6.test, tests/lisp2.test, tests/location.test, * tests/nogzip2.test, tests/output5.test, tests/overrid.test, * tests/percent.test, tests/percent2.test, * tests/pluseq5.test, tests/pluseq7.test, tests/pluseq9.test, * tests/pr211.test, tests/primary.test, tests/primary2.test, * tests/python2.test, tests/recurs.test, tests/reqd2.test, * tests/seenc.test, tests/specflg.test, tests/specflg2.test, * tests/spell.test, tests/spell2.test, tests/srcsub.test, * tests/srcsub2.test, tests/stdlib.test, tests/subdir7.test, * tests/substtarg.test, tests/suffix11.test, * tests/symlink.test, tests/syntax.test, * tests/targetclash.test, tests/txinfo4.test, * tests/version3.test, tests/warnopts.test, * tests/xsource.test, tests/yacc2.test: Use set -e, AUTOMAKE_fails, and always grep error message.
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
#! /bin/sh
# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
# GNU Automake 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.
#
# GNU Automake 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 Automake; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
# Test the += diagnostics.
. ./defs || exit 1
set -e
cat >>configure.in <<EOF
AM_CONDITIONAL(COND1, true)
AM_CONDITIONAL(COND2, true)
AM_CONDITIONAL(COND3, true)
EOF
cat > Makefile.am << 'END'
if COND1
C = c
if COND2
A = a
B = aa
C += cc
else
A = b
B = bb
endif
A += c
else
A = d
endif
A += e
if COND3
A += f
B = cc
endif
B += dd
END
$ACLOCAL
AUTOMAKE_fails
# We expect the following diagnostic:
#
# Makefile.am:19: Cannot apply `+=' because `B' is not defined in
# Makefile.am:19: the following conditions:
# Makefile.am:19: !COND1 and !COND3
# Makefile.am:19: Either define `B' in these conditions, or use
# Makefile.am:19: `+=' in the same conditions as the definitions.
#
# It would be nice if Automake could print only COND3_FALSE and
# COND1_FALSE (merging the last two conditions), so we'll support
# this case in the check too.
grep ': !COND1 and !COND3$' stderr
# Make sure there is exactly one missing condition.
test `grep ': ' stderr | wc -l` = 1