Hash :
fadd73d7
Author :
Date :
2010-11-21T16:25:45
Tests: consistently use "|| Exit 1" after ". ./defs". The test scripts below has been modified with this command: $ sed -i 's/^\. \.\/defs *$/& || Exit 1/' tests/*.test * tests/autohdr.test: Use `. ./defs || Exit 1', not bare `. ./defs', for consistency with other tests. * tests/autohdr2.test: Likewise. * tests/autohdr3.test: Likewise. * tests/autohdr4.test: Likewise. * tests/cond23.test: Likewise. * tests/cond24.test: Likewise. * tests/cond25.test: Likewise. * tests/cond26.test: Likewise. * tests/cond27.test: Likewise. * tests/cond28.test: Likewise. * tests/cond29.test: Likewise. * tests/cond30.test: Likewise. * tests/cond31.test: Likewise. * tests/cond32.test: Likewise. * tests/cond33.test: Likewise. * tests/cond34.test: Likewise. * tests/cond35.test: Likewise. * tests/cond36.test: Likewise. * tests/cond37.test: Likewise. * tests/cond38.test: Likewise. * tests/cond39.test: Likewise. * tests/cond40.test: Likewise. * tests/cond41.test: Likewise. * tests/cond42.test: Likewise. * tests/cond43.test: Likewise. * tests/cond44.test: Likewise. * tests/cond45.test: Likewise. * tests/dollarvar.test: Likewise. * tests/dollarvar2.test: Likewise. * tests/hfs.test: Likewise. * tests/libobj14.test: Likewise. * tests/percent.test: Likewise. * tests/percent2.test: Likewise. * tests/phony.test: Likewise. * tests/silent.test: Likewise. * tests/silent2.test: Likewise. * tests/silent3.test: Likewise. * tests/silent4.test: Likewise. * tests/silent5.test: Likewise. * tests/silent6.test: Likewise. * tests/silent7.test: Likewise. * tests/silent9.test: Likewise. * tests/silentcxx.test: Likewise. * tests/silentf77.test: Likewise. * tests/silentf90.test: Likewise. * tests/silentlex.test: Likewise. * tests/silentyacc.test: Likewise.
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
#! /bin/sh
# Copyright (C) 2008, 2010 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., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
# Test AM_COND_IF.
. ./defs || Exit 1
set -e
cat >>configure.in <<'END'
AC_DEFUN([FOO],
[AC_CONFIG_FILES([$1])])
AM_CONDITIONAL([COND], [test "$cond" = yes])
# Next lines should not cause a shell syntax error.
AM_COND_IF([COND])
AM_COND_IF([COND],
[AC_SUBST([BAR])])
AM_COND_IF([COND],
[AC_CONFIG_FILES([file1])])
# Things should work even at a time when the shell expressions
# for the conditional are not valid any more.
ok=$cond1
AM_CONDITIONAL([COND1], [test "$ok" = yes])
ok=$cond2
AM_CONDITIONAL([COND2], [test "$ok" = yes])
ok=$cond3
AM_CONDITIONAL([COND3], [test "$ok" = yes])
AM_COND_IF([COND1],
[AM_COND_IF([COND2], [FOO([file2])],
[AM_COND_IF([COND3],
[FOO([file3])])])])
AC_OUTPUT
END
: >Makefile.am
: >file1.in
: >file2.in
: >file3.in
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure cond=yes cond1=yes cond2=no cond3=yes
test -f file1
test ! -f file2
test -f file3
rm -f file1 file3
$MAKE file1 file3
$MAKE file2 && Exit 1
test -f file1
test ! -f file2
test -f file3
$MAKE distclean
./configure cond=no cond1=yes cond2=yes
test ! -f file1
test -f file2
test ! -f file3
rm -f file2
$MAKE file1 && Exit 1
$MAKE file2
$MAKE file3 && Exit 1
test ! -f file1
test -f file2
test ! -f file3
: