diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-12-24 16:27:28 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-12-24 16:50:03 +0100 |
| commit | a6d6734fca39448770365e77acb562e6c42a7ea2 (patch) | |
| tree | 036bc50503ae9a0a1a30d483dbc3553cf0f3b7a4 /t/tap-signal.tap | |
| parent | 526c4b04a699fd62da6bc3915cdb333f0a6ca92d (diff) | |
| download | automake-a6d6734fca39448770365e77acb562e6c42a7ea2.tar.gz | |
TAP driver: remove perl implementation (move it into contrib/)
That implementation was only meant as a standard against which the
portable awk+shell implementation was to be measured. Now, since
Automake 1.12, the latter implementation is fully functional and
already used in the wild, and in fact feature-par with the perl
implementation. So the perl implementation is now just slowing
down and complicating our testsuite. Let's move it to 'contrib/'
(we don't want to remove it, in case someone is actually using it
in the wild).
* lib/tap-driver.pl: Move it ...
* contrib/tap-driver.pl: ... here. While at it, convert quoting
`like this' to quoting 'like this', and remove an obsolescent FIXME
comment.
* lib/Makefile.inc (dist_script_DATA): Drop '%D%/tap-driver.pl'.
* Makefile.am (EXTRA_DIST): Add 'contrib/tap-driver.pl'.
* doc/automake.texi: Remove one stray reference to 'tap-driver.pl',
and reference 'tap-driver.sh' instead, as intended.
* t/ax/am-test-lib.sh ($am_tap_implementation): Delete definition and
uses.
(fetch_tap_driver): Simplify to unconditionally assume the shell+awk
implementation of the TAP driver is used.
(get_shell_script): Make more flexible so that it can cater to the
needs of 'fetch_tap_driver()'.
* t/tap-bad-prog.tap: Likewise.
* t/tap-bailout-leading-space.sh: Likewise.
* t/tap-signal.tap: Likewise.
* t/tap-test-number-0.sh: Likewise.
* t/test-driver-cond.sh: Use 'tap-driver.sh' instead of 'tap-driver.pl'.
* gen-testsuite-part (%test_generators): Do not generate sister tests
that use the perl TAP driver rather than the shell+awk one.
* NEWS: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/tap-signal.tap')
| -rw-r--r-- | t/tap-signal.tap | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/t/tap-signal.tap b/t/tap-signal.tap index f1a81308b..70fe5c19d 100644 --- a/t/tap-signal.tap +++ b/t/tap-signal.tap @@ -93,13 +93,8 @@ signal_caught () esac wbound_re="($|[^a-zA-Z0-9_-])" pfx_re="^ERROR: signal-$numeric\\.test" - case $am_tap_implementation in - # Dummy escape to please maintainer-check. - per\l) rx="$pfx_re - terminated by signal $sig_re$";; - shell) rx="$pfx_re .*terminated by signal $sig_re$wbound_re";; - *) fatal_ "invalid \$am_tap_implementation '$am_tap_implementation'";; - esac - desc="TAP driver catch test termination by signal SIG$symbolic" + rx="${pfx_re} .*terminated by signal ${sig_re}${wbound_re}" + desc="TAP driver catch test termination by signal SIG${symbolic}" case " $blocked_signals " in *" $numeric "*) skip_ -r "SIG$symbolic is blocked" "$desc" ;; *) command_ok_ "$desc" env LC_ALL=C $EGREP "$rx" stdout ;; |