From aaf20d11fb97ee8d4f667eea4bf58ded45200e22 Mon Sep 17 00:00:00 2001 From: Assaf Gordon Date: Fri, 28 Apr 2017 18:11:43 -0400 Subject: [PATCH] tests: convert 'bsd' test to new framework The 'bsd.sh' is a long shell script (imported from NetBSD) which runs multiple tests, then compares the output to 'bsd.good'. The 'bsd.sh' is not modified. Instead, a new script 'bsd-wrapper.sh' is created to work with the newer init.sh-style testing framework. * testsuite/bsd-wrapper.sh: New test. * testsuite/local.mk (SEDTESTS): Remove old test. (T): Add new test. --- testsuite/bsd-wrapper.sh | 33 +++++++++++++++++++++++++++++++++ testsuite/local.mk | 3 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 testsuite/bsd-wrapper.sh diff --git a/testsuite/bsd-wrapper.sh b/testsuite/bsd-wrapper.sh new file mode 100644 index 0000000..4a9dc87 --- /dev/null +++ b/testsuite/bsd-wrapper.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# Test runner for the old bsd tests + +# 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 the external SED scripts +dir="$abs_top_srcdir/testsuite" + +# The 'bsd.sh' script runs multiple tests and generates sed.out file. +sh "$dir/bsd.sh" || fail=1 +remove_cr_inplace sed.out +compare "$dir/bsd.good" sed.out || fail=1 + + +Exit $fail diff --git a/testsuite/local.mk b/testsuite/local.mk index 73e18c6..10245ea 100644 --- a/testsuite/local.mk +++ b/testsuite/local.mk @@ -87,6 +87,7 @@ endif # Old tests converted to newer init.sh style T += testsuite/8bit.sh \ testsuite/binary.sh \ + testsuite/bsd-wrapper.sh \ testsuite/dc.sh \ testsuite/help.sh \ testsuite/utf8-ru.sh \ @@ -118,7 +119,7 @@ SEDTESTS += testsuite/newjis \ testsuite/madding testsuite/mac-mf \ testsuite/eval \ testsuite/distrib testsuite/8to7 \ - testsuite/bsd testsuite/stdin \ + testsuite/stdin \ testsuite/badenc testsuite/inplace-hold # Note that the first lines are statements. They ensure that environment