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 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255
#! /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/>.
# Sanity check for the automake testsuite.
# Check the 'unindent' subroutine.
. ./defs || exit 1
plan_ 22
#------------------------------------------------------------------
will_test () { tst=$*; }
do_check ()
{
command_ok_ "$tst [simple, exit status]" \
eval 'unindent input > got'
command_ok_ "$tst [simple, output]" \
diff exp got
command_ok_ "$tst [parallel, exit status]" \
eval 'unindent input | unindent > got'
command_ok_ "$tst [parallel, output]" \
diff exp got
}
#------------------------------------------------------------------
will_test 'leading spaces'
cat > input <<END
1
2
3
4
${tab}5
${tab} 6
6${sp}
7${sp}
8${sp}${sp}
9${sp}${sp}
10${tab}
11${tab}
12${sp}${tab}
13${sp}${tab}
14 this${tab}with${tab}multiple fields${sp}
15 and ${tab}${tab}this too${tab}
16 and also this
${sp}${sp}
${sp}
${tab}
last line
END
cat > exp <<END
1
2
3
4
${tab}5
${tab} 6
6${sp}
7${sp}
8${sp}${sp}
9${sp}${sp}
10${tab}
11${tab}
12${sp}${tab}
13${sp}${tab}
14 this${tab}with${tab}multiple fields${sp}
15 and ${tab}${tab}this too${tab}
16 and also this
${sp}
${tab}
last line
END
do_check
#------------------------------------------------------------------
will_test 'leading tab'
cat > input <<END
${tab}1
${tab} 2
3
4
5
6
7
${tab}8
${tab}${tab}9
${tab}10${tab}
${tab}11${sp}
12${tab}
13${sp}
${tab}14 this with${tab}multiple fields${sp}
15 and ${tab}${tab}this too${tab}
16 and also this
${tab}
${sp}
${sp}${tab}
last line
END
cat > exp <<END
1
2
3
4
5
6
7
${tab}8
${tab}9
10${tab}
11${sp}
12${tab}
13${sp}
14 this with${tab}multiple fields${sp}
15 and ${tab}${tab}this too${tab}
16 and also this
${sp}
${sp}${tab}
last line
END
do_check "leading tab"
#------------------------------------------------------------------
will_test 'no leading whitespace'
cat > input <<END
1
2
3
4
${tab}5
${tab} 6
${tab}7
${tab}${tab}8
9${sp}
10${tab}
${tab}10${sp}${sp}
14 this with${tab}multiple fields${sp}
15 and this too${tab}
${tab}16 and also this
${tab}
${sp}
last line
END
cp input exp
do_check
#------------------------------------------------------------------
will_test 'leading empty lines ignored (1)'
cat > input <<END
foo
bar
quux
END
cat > exp <<END
foo
bar
quux
END
do_check
#------------------------------------------------------------------
will_test 'leading empty lines ignored (2)'
cat > input <<END
foo
bar
quux
END
cat > exp <<END
foo
bar
quux
END
do_check
#------------------------------------------------------------------
will_test 'more elaborated parallel use'
cat > input <<END
x
${tab}y
z
${tab}a
${tab} b
${tab}c
${tab}d
${tab}e
${tab}${tab}f
END
cat > exp <<END
y
z
a
b
c
${tab}d
${tab}e
${tab}f
END
command_ok_ "$tst [exit status]" \
eval 'unindent input | sed 1d | unindent > got'
command_ok_ "$tst [output]" diff exp got
: