From 7bef3571bd3a9fd82ebfed9f37939e00b444fcbd Mon Sep 17 00:00:00 2001 From: "G. Branden Robinson" Date: Tue, 21 Feb 2023 22:15:35 -0600 Subject: [ms]: Rename test. * tmac/tests/s_no-excess-space-around-displays.tmac: Rename... * tmac/tests/s_no-excess-space-around-displays.sh: ...to this. * tmac/tmac.am (tmac_TESTS): Update. The original name of this test was a thoughtless error; renaming it more intelligibly facilitates a necessary procedure for getting the tests to run on Solaris 10 (where /bin/sh is a pre-POSIX clay tablet version). gsed -i -e '1s@#!/bin/sh@#!/usr/xpg4/bin/sh@' \ `find . -name '*.sh' | grep /tests/` PATH=/usr/xpg4/bin:$PATH gmake check --- ChangeLog | 8 +++++ tmac/tests/s_no-excess-space-around-displays.sh | 39 +++++++++++++++++++++++ tmac/tests/s_no-excess-space-around-displays.tmac | 39 ----------------------- tmac/tmac.am | 2 +- 4 files changed, 48 insertions(+), 40 deletions(-) create mode 100755 tmac/tests/s_no-excess-space-around-displays.sh delete mode 100755 tmac/tests/s_no-excess-space-around-displays.tmac diff --git a/ChangeLog b/ChangeLog index cd2dafde6..6602e3eb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2023-02-21 G. Branden Robinson + + [ms]: Rename test. + + * tmac/tests/s_no-excess-space-around-displays.tmac: Rename... + * tmac/tests/s_no-excess-space-around-displays.sh: ...to this. + * tmac/tmac.am (tmac_TESTS): Update. + 2023-02-21 G. Branden Robinson [gropdf]: Revise tests to run unconditionally, rather than diff --git a/tmac/tests/s_no-excess-space-around-displays.sh b/tmac/tests/s_no-excess-space-around-displays.sh new file mode 100755 index 000000000..a2193fe7a --- /dev/null +++ b/tmac/tests/s_no-excess-space-around-displays.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# +# Copyright (C) 2022 Free Software Foundation, Inc. +# +# This file is part of groff. +# +# groff 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 3 of the License, or +# (at your option) any later version. +# +# groff 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 . +# + +groff="${abs_top_builddir:-.}/test-groff" + +# Regression-test Savannah #62688. + +input='.pl 19v +.LP +This is my first paragraph. +.LD +This is my block display. +.DE +.LP +This is my second paragraph.' + +output=$(printf '%s\n' "$input" | "$groff" -Tascii -P-cbou -ms \ + | awk '{print NR, $0}') + +echo "$output" | grep -Fqx '11 This is my second paragraph.' + +# vim:set ai et sw=4 ts=4 tw=72: diff --git a/tmac/tests/s_no-excess-space-around-displays.tmac b/tmac/tests/s_no-excess-space-around-displays.tmac deleted file mode 100755 index a2193fe7a..000000000 --- a/tmac/tests/s_no-excess-space-around-displays.tmac +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Free Software Foundation, Inc. -# -# This file is part of groff. -# -# groff 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 3 of the License, or -# (at your option) any later version. -# -# groff 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 . -# - -groff="${abs_top_builddir:-.}/test-groff" - -# Regression-test Savannah #62688. - -input='.pl 19v -.LP -This is my first paragraph. -.LD -This is my block display. -.DE -.LP -This is my second paragraph.' - -output=$(printf '%s\n' "$input" | "$groff" -Tascii -P-cbou -ms \ - | awk '{print NR, $0}') - -echo "$output" | grep -Fqx '11 This is my second paragraph.' - -# vim:set ai et sw=4 ts=4 tw=72: diff --git a/tmac/tmac.am b/tmac/tmac.am index 255e77981..437297acb 100644 --- a/tmac/tmac.am +++ b/tmac/tmac.am @@ -230,7 +230,7 @@ tmac_TESTS = \ tmac/tests/s_XA-literal-no-argument-suppresses-leader.sh \ tmac/tests/s_honor-MINGW-when-two-columns.sh \ tmac/tests/s_mark-column-start-correctly.sh \ - tmac/tests/s_no-excess-space-around-displays.tmac \ + tmac/tests/s_no-excess-space-around-displays.sh \ tmac/tests/s_rejects-too-short-page-lengths.sh TESTS += $(tmac_TESTS) EXTRA_DIST += $(tmac_TESTS) -- cgit v1.2.1