From 33c424249122bb686ca3db067cee2f609407eedc Mon Sep 17 00:00:00 2001 From: Assaf Gordon Date: Sat, 22 Apr 2017 15:57:44 -0400 Subject: [PATCH] tests: convert 'xemacs' test to new framework Keep input/expected output files (xemacs.inp/xemacs.good) as they contain lines longar than 80 characters (which will fail 'make syntax-check'). * testsuite/xemacs.sed: Remove. * testsuite/xemacs.sh: New test. * testsuite/local.mk (EXTRA_DIST): Remove xemacs.sed. (SEDTESTS): Remove old xemacs test. (T): Add new xemacs.sh test. --- testsuite/local.mk | 7 +++--- testsuite/xemacs.sed | 16 -------------- testsuite/xemacs.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 20 deletions(-) delete mode 100644 testsuite/xemacs.sed create mode 100755 testsuite/xemacs.sh diff --git a/testsuite/local.mk b/testsuite/local.mk index 1a16aa6..73e18c6 100644 --- a/testsuite/local.mk +++ b/testsuite/local.mk @@ -90,7 +90,8 @@ T += testsuite/8bit.sh \ testsuite/dc.sh \ testsuite/help.sh \ testsuite/utf8-ru.sh \ - testsuite/uniq.sh + testsuite/uniq.sh \ + testsuite/xemacs.sh TESTS = $(check_PROGRAMS) $(SEDTESTS) $(T) @@ -115,7 +116,6 @@ endif SEDTESTS += testsuite/newjis \ testsuite/noeolw \ testsuite/madding testsuite/mac-mf \ - testsuite/xemacs \ testsuite/eval \ testsuite/distrib testsuite/8to7 \ testsuite/bsd testsuite/stdin \ @@ -222,8 +222,7 @@ EXTRA_DIST += \ testsuite/badenc.inp \ testsuite/badenc.sed \ testsuite/xemacs.good \ - testsuite/xemacs.inp \ - testsuite/xemacs.sed + testsuite/xemacs.inp # automake makes `check' depend on $(TESTS). Declare # dummy targets for $(TESTS) so that make does not complain. diff --git a/testsuite/xemacs.sed b/testsuite/xemacs.sed deleted file mode 100644 index ee2f744..0000000 --- a/testsuite/xemacs.sed +++ /dev/null @@ -1,16 +0,0 @@ -# Inspired by xemacs' config.status script -# submitted by John Fremlin (john@fremlin.de) - -/^# Generated/d -s%/\*\*/#.*%% -s/^ *# */#/ -/^##/d -/^#/ { - p - d -} -/./ { - s/\([\"]\)/\\\1/g - s/^/"/ - s/$/"/ -} diff --git a/testsuite/xemacs.sh b/testsuite/xemacs.sh new file mode 100755 index 0000000..e07c334 --- /dev/null +++ b/testsuite/xemacs.sh @@ -0,0 +1,51 @@ +#!/bin/sh + +# Test runner for xemacs.sed + +# Copyright (C) 2017 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 3 of the License, 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 . +. "${srcdir=.}/testsuite/init.sh"; path_prepend_ ./sed +print_ver_ sed + +fail=0 + +# location of external test files +dir="$abs_top_srcdir/testsuite" + +# Inspired by xemacs' config.status script +# submitted by John Fremlin (john@fremlin.de) +cat << \EOF > xemacs.sed || framework_failure_ +/^# Generated/d +s%/\*\*/#.*%% +s/^ *# */#/ +/^##/d +/^#/ { + p + d +} +/./ { + s/\([\"]\)/\\\1/g + s/^/"/ + s/$/"/ +} +EOF + + +sed -f xemacs.sed < "$dir/xemacs.inp" > out || fail=1 +remove_cr_inplace out +compare "$dir/xemacs.good" out || fail=1 + + +Exit $fail