From cd487b1e242931e637d813327e7cd1bd8b45eb4e Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 13 Jun 2009 14:05:11 +0200 Subject: [PATCH] sed(1): Remove the old regression tests. FreeBSD's tests in tools/regression/usr.bin/sed are more comprehensive. --- usr.bin/sed/TEST/hanoi.sed | 104 --------- usr.bin/sed/TEST/math.sed | 163 ------------- usr.bin/sed/TEST/sed.test | 552 --------------------------------------------- 3 files changed, 819 deletions(-) delete mode 100644 usr.bin/sed/TEST/hanoi.sed delete mode 100644 usr.bin/sed/TEST/math.sed delete mode 100644 usr.bin/sed/TEST/sed.test diff --git a/usr.bin/sed/TEST/hanoi.sed b/usr.bin/sed/TEST/hanoi.sed deleted file mode 100644 index d6d474958e..0000000000 --- a/usr.bin/sed/TEST/hanoi.sed +++ /dev/null @@ -1,104 +0,0 @@ -# Towers of Hanoi in sed. -# -# @(#)hanoi.sed 8.1 (Berkeley) 6/6/93 -# $FreeBSD: src/usr.bin/sed/TEST/hanoi.sed,v 1.1.1.1.14.1 2002/07/17 09:35:56 tjr Exp $ -# $DragonFly: src/usr.bin/sed/TEST/hanoi.sed,v 1.2 2003/06/17 04:29:31 dillon Exp $ -# -# -# Ex: -# Run "sed -f hanoi.sed", and enter: -# -# :abcd: : : -# -# note -- TWO carriage returns were once required, this will output the -# sequence of states involved in moving 4 rings, the largest called "a" and -# the smallest called "d", from the first to the second of three towers, so -# that the rings on any tower at any time are in descending order of size. -# You can start with a different arrangement and a different number of rings, -# say :ce:b:ax: and it will give the shortest procedure for moving them all -# to the middle tower. The rules are: the names of the rings must all be -# lower-case letters, they must be input within 3 fields (representing the -# towers) and delimited by 4 colons, such that the letters within each field -# are in alphabetical order (i.e. rings are in descending order of size). -# -# For the benefit of anyone who wants to figure out the script, an "internal" -# line of the form -# b:0abx:1a2b3 :2 :3x2 -# has the following meaning: the material after the three markers :1, :2, -# and :3 represents the three towers; in this case the current set-up is -# ":ab : :x :". The numbers after a, b and x in these fields indicate -# that the next time it gets a chance, it will move a to tower 2, move b -# to tower 3, and move x to tower 2. The string after :0 just keeps track -# of the alphabetical order of the names of the rings. The b at the -# beginning means that it is now dealing with ring b (either about to move -# it, or re-evaluating where it should next be moved to). -# -# Although this version is "limited" to 26 rings because of the size of the -# alphabet, one could write a script using the same idea in which the rings -# were represented by arbitrary [strings][within][brackets], and in place of -# the built-in line of the script giving the order of the letters of the -# alphabet, it would accept from the user a line giving the ordering to be -# assumed, e.g. [ucbvax][decvax][hplabs][foo][bar]. -# -# George Bergman -# Math, UC Berkeley 94720 USA - -# cleaning, diagnostics -s/ *//g -/^$/d -/[^a-z:]/{a\ -Illegal characters: use only a-z and ":". Try again. -d -} -/^:[a-z]*:[a-z]*:[a-z]*:$/!{a\ -Incorrect format: use\ -\ : string1 : string2 : string3 :\ -Try again. -d -} -/\([a-z]\).*\1/{a\ -Repeated letters not allowed. Try again. -d -} -# initial formatting -h -s/[a-z]/ /g -G -s/^:\( *\):\( *\):\( *\):\n:\([a-z]*\):\([a-z]*\):\([a-z]*\):$/:1\4\2\3:2\5\1\3:3\6\1\2:0/ -s/[a-z]/&2/g -s/^/abcdefghijklmnopqrstuvwxyz/ -:a -s/^\(.\).*\1.*/&\1/ -s/.// -/^[^:]/ba -s/\([^0]*\)\(:0.*\)/\2\1:/ -s/^[^0]*0\(.\)/\1&/ -:b -# outputting current state without markers -h -s/.*:1/:/ -s/[123]//gp -g -:c -# establishing destinations -/^\(.\).*\1:1/td -/^\(.\).*:1[^:]*\11/s/^\(.\)\(.*\1\([a-z]\).*\)\3./\3\2\31/ -/^\(.\).*:1[^:]*\12/s/^\(.\)\(.*\1\([a-z]\).*\)\3./\3\2\33/ -/^\(.\).*:1[^:]*\13/s/^\(.\)\(.*\1\([a-z]\).*\)\3./\3\2\32/ -/^\(.\).*:2[^:]*\11/s/^\(.\)\(.*\1\([a-z]\).*\)\3./\3\2\33/ -/^\(.\).*:2[^:]*\12/s/^\(.\)\(.*\1\([a-z]\).*\)\3./\3\2\32/ -/^\(.\).*:2[^:]*\13/s/^\(.\)\(.*\1\([a-z]\).*\)\3./\3\2\31/ -/^\(.\).*:3[^:]*\11/s/^\(.\)\(.*\1\([a-z]\).*\)\3./\3\2\32/ -/^\(.\).*:3[^:]*\12/s/^\(.\)\(.*\1\([a-z]\).*\)\3./\3\2\31/ -/^\(.\).*:3[^:]*\13/s/^\(.\)\(.*\1\([a-z]\).*\)\3./\3\2\33/ -bc -# iterate back to find smallest out-of-place ring -:d -s/^\(.\)\(:0[^:]*\([^:]\)\1.*:\([123]\)[^:]*\1\)\4/\3\2\4/ -td -# move said ring (right, resp. left) -s/^\(.\)\(.*\)\1\([23]\)\(.*:\3[^ ]*\) /\1\2 \4\1\3/ -s/^\(.\)\(.*:\([12]\)[^ ]*\) \(.*\)\1\3/\1\2\1\3\4 / -tb -s/.*/Done! Try another, or end with ^D./p -d diff --git a/usr.bin/sed/TEST/math.sed b/usr.bin/sed/TEST/math.sed deleted file mode 100644 index 8e7bf51fbc..0000000000 --- a/usr.bin/sed/TEST/math.sed +++ /dev/null @@ -1,163 +0,0 @@ -# -# @(#)math.sed 8.1 (Berkeley) 6/6/93 -# -# Addition and multiplication in sed. -# ++ for a limited time only do (expr) too!!! -# -# Kevin S Braunsdorf, PUCC UNIX Group, ksb@cc.purdue.edu. -# -# Ex: -# echo "4+7*3" | sed -f %f - -# make sure the expression is well formed -s/[ ]//g -/[+*\/-]$/{ - a\ - poorly formed expression, operator on the end - q -} -/^[+*\/]/{ - a\ - poorly formed expression, leading operator - q -} - -# fill hold space with done token -x -s/^.*/done/ -x - -# main loop, process operators (*, + and () ) -: loop -/^\+/{ - s/// - b loop -} -/^\(.*\)(\([^)]*\))\(.*\)$/{ - H - s//\2/ - x - s/^\(.*\)\n\(.*\)(\([^()]*\))\(.*\)$/()\2@\4@\1/ - x - b loop -} -/^[0-9]*\*/b mul -/^\([0-9]*\)\+\([0-9+*]*\*[0-9]*\)$/{ - s//\2+\1/ - b loop -} -/^[0-9]*\+/{ - s/$/=/ - b add -} -x -/^done$/{ - x - p - d -} -/^()/{ - s/// - x - G - s/\(.*\)\n\([^@]*\)@\([^@]*\)@\(.*\)/\2\1\3/ - x - s/[^@]*@[^@]*@\(.*\)/\1/ - x - b loop -} -i\ -help, stack problem -p -x -p -q - -# turn mul into add until 1*x -> x -: mul -/^0*1\*/{ - s/// - b loop -} -/^\([0-9]*\)0\*/{ - s/^\([0-9]*\)0\*\([0-9]*\)/\1*\20/ - b mul -} -s/^\([0-9]*\)1\*/\10*/ -s/^\([0-9]*\)2\*/\11*/ -s/^\([0-9]*\)3\*/\12*/ -s/^\([0-9]*\)4\*/\13*/ -s/^\([0-9]*\)5\*/\14*/ -s/^\([0-9]*\)6\*/\15*/ -s/^\([0-9]*\)7\*/\16*/ -s/^\([0-9]*\)8\*/\17*/ -s/^\([0-9]*\)9\*/\18*/ -s/\*\([0-9*]*\)/*\1+\1/ -b mul - -# get rid of a plus term until 0+x -> x -: add -/^\+\([0-9+*]*\)=/{ - s//\1/ - b loop -} -/^\([0-9*]*\)\+=/{ - s//\1/ - b loop -} -/^\([0-9]*\)\+\([0-9*+]*\)\+=/{ - s//\2+\1/ - b loop -} -/^\([0-9]*\)0\+\([0-9]*\)\([0-9]\)=/{ - s//\1+\2=\3/ - b add -} -/^\([0-9]*\)\([0-9]\)\+\([0-9]*\)0=/{ - s//\1+\3=\2/ - b add -} -/^\([0-9]*\)0\+\([0-9*+]*\)\+\([0-9]*\)\([0-9]\)=/{ - s//\1+\2+\3=\4/ - b add -} -/^\([0-9]*\)\([0-9]\)\+\([0-9*+]*\)\+\([0-9]*\)0=/{ - s//\1+\3+\4=\2/ - b add -} -s/^\([0-9]*\)1\+/\10+/ -s/^\([0-9]*\)2\+/\11+/ -s/^\([0-9]*\)3\+/\12+/ -s/^\([0-9]*\)4\+/\13+/ -s/^\([0-9]*\)5\+/\14+/ -s/^\([0-9]*\)6\+/\15+/ -s/^\([0-9]*\)7\+/\16+/ -s/^\([0-9]*\)8\+/\17+/ -s/^\([0-9]*\)9\+/\18+/ - -s/9=\([0-9]*\)$/_=\1/ -s/8=\([0-9]*\)$/9=\1/ -s/7=\([0-9]*\)$/8=\1/ -s/6=\([0-9]*\)$/7=\1/ -s/5=\([0-9]*\)$/6=\1/ -s/4=\([0-9]*\)$/5=\1/ -s/3=\([0-9]*\)$/4=\1/ -s/2=\([0-9]*\)$/3=\1/ -s/1=\([0-9]*\)$/2=\1/ -/_/{ - s//_0/ - : inc - s/9_/_0/ - s/8_/9/ - s/7_/8/ - s/6_/7/ - s/5_/6/ - s/4_/5/ - s/3_/4/ - s/2_/3/ - s/1_/2/ - s/0_/1/ - s/\+_/+1/ - /_/b inc -} -b add diff --git a/usr.bin/sed/TEST/sed.test b/usr.bin/sed/TEST/sed.test deleted file mode 100644 index 71c7f20b52..0000000000 --- a/usr.bin/sed/TEST/sed.test +++ /dev/null @@ -1,552 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 1992 Diomidis Spinellis. -# Copyright (c) 1992, 1993 -# The Regents of the University of California. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the University of -# California, Berkeley and its contributors. -# 4. Neither the name of the University nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# @(#)sed.test 8.1 (Berkeley) 6/6/93 -# - -# sed Regression Tests -# -# The following files are created: -# lines[1-4], script1, script2 -# Two directories *.out contain the test results - -main() -{ - BASE=/usr/bin/sed - BASELOG=sed.out - TEST=`cd ..; make whereobj`/sed - TESTLOG=nsed.out - DICT=/usr/share/dict/words - - test_error | more - - awk 'END { for (i = 1; i < 15; i++) print "l1_" i}' lines1 - awk 'END { for (i = 1; i < 10; i++) print "l2_" i}' lines2 - - exec 4>&1 5>&2 - - # Set these flags to get messages about known problems - BSD=1 - GNU=0 - SUN=0 - tests $BASE $BASELOG - - BSD=0 - GNU=0 - SUN=0 - tests $TEST $TESTLOG - exec 1>&4 2>&5 - diff -c $BASELOG $TESTLOG | more -} - -tests() -{ - SED=$1 - DIR=$2 - rm -rf $DIR - mkdir $DIR - MARK=100 - - test_args - test_addr - echo Testing commands - test_group - test_acid - test_branch - test_pattern - test_print - test_subst -} - -mark() -{ - MARK=`expr $MARK + 1` - exec 1>&4 2>&5 - exec >"$DIR/${MARK}_$1" - echo "Test $1:$MARK" - # Uncomment this line to match tests with sed error messages - echo "Test $1:$MARK" >&5 -} - -test_args() -{ - mark '1.1' - echo Testing argument parsing - echo First type - if [ $SUN -eq 1 ] ; then - echo SunOS sed prints only with -n - else - $SED 's/^/e1_/p' lines1 - fi - mark '1.2' ; $SED -n 's/^/e1_/p' lines1 - mark '1.3' - if [ $SUN -eq 1 ] ; then - echo SunOS sed prints only with -n - else - $SED 's/^/e1_/p' script1 - echo 's/^/s2_/p' >script2 - mark '1.5' - if [ $SUN -eq 1 ] ; then - echo SunOS sed prints only with -n - else - $SED -f script1 lines1 - fi - mark '1.6' - if [ $SUN -eq 1 ] ; then - echo SunOS sed prints only with -n - else - $SED -f script1 script1 <lines3 - # GNU and SunOS sed behave differently here - mark '7.1' - if [ $BSD -eq 1 ] ; then - echo 'BSD sed drops core on this one; TEST SKIPPED' - else - $SED -n l lines3 - fi - mark '7.2' ; $SED -e '/l2_/=' lines1 lines2 - rm -f lines4 - mark '7.3' ; $SED -e '3,12w lines4' lines1 - echo w results - cat lines4 - mark '7.4' ; $SED -e '4r lines2' lines1 - mark '7.5' ; $SED -e '5r /dev/dds' lines1 - mark '7.6' ; $SED -e '6r /dev/null' lines1 - mark '7.7' - if [ $BSD -eq 1 -o $GNU -eq 1 -o $SUN -eq 1 ] ; then - echo BSD, GNU and SunOS cannot pass this one - else - sed '200q' $DICT | sed 's$.*$s/^/&/w tmpdir/&$' >script1 - rm -rf tmpdir - mkdir tmpdir - $SED -f script1 lines1 - cat tmpdir/* - rm -rf tmpdir - fi - mark '7.8' - if [ $BSD -eq 1 ] ; then - echo BSD sed cannot pass 7.7 - else - echo line1 > lines3 - echo "" >> lines3 - $SED -n -e '$p' lines3 /dev/null - fi - -} - -test_subst() -{ - echo Testing substitution commands - mark '8.1' ; $SED -e 's/./X/g' lines1 - mark '8.2' ; $SED -e 's,.,X,g' lines1 -# GNU and SunOS sed thinks we are escaping . as wildcard, not as separator -# mark '8.3' ; $SED -e 's.\..X.g' lines1 -# POSIX does not say that this should work -# mark '8.4' ; $SED -e 's/[/]/Q/' lines1 - mark '8.4' ; $SED -e 's/[\/]/Q/' lines1 - mark '8.5' ; $SED -e 's_\__X_' lines1 - mark '8.6' ; $SED -e 's/./(&)/g' lines1 - mark '8.7' ; $SED -e 's/./(\&)/g' lines1 - mark '8.8' ; $SED -e 's/\(.\)\(.\)\(.\)/x\3x\2x\1/g' lines1 - mark '8.9' ; $SED -e 's/_/u0\ -u1\ -u2/g' lines1 - mark '8.10' - if [ $BSD -eq 1 -o $GNU -eq 1 ] ; then - echo 'BSD/GNU sed do not understand digit flags on s commands' - fi - $SED -e 's/./X/4' lines1 - rm -f lines4 - mark '8.11' ; $SED -e 's/1/X/w lines4' lines1 - echo s wfile results - cat lines4 - mark '8.12' ; $SED -e 's/[123]/X/g' lines1 - mark '8.13' ; $SED -e 'y/0123456789/9876543210/' lines1 - mark '8.14' ; - if [ $BSD -eq 1 -o $GNU -eq 1 -o $SUN -eq 1 ] ; then - echo BSD/GNU/SUN sed fail this test - else - $SED -e 'y10\123456789198765432\101' lines1 - fi - mark '8.15' ; $SED -e '1N;2y/\n/X/' lines1 - mark '8.16' - if [ $BSD -eq 1 ] ; then - echo 'BSD sed does not handle branch defined REs' - else - echo 'eeefff' | $SED -e 'p' -e 's/e/X/p' -e ':x' \ - -e 's//Y/p' -e '/f/bx' - fi -} - -test_error() -{ - exec 0>&3 4>&1 5>&2 - exec 0&1 - set -x - $TEST -x && exit 1 - $TEST -f && exit 1 - $TEST -e && exit 1 - $TEST -f /dev/dds && exit 1 - $TEST p /dev/dds && exit 1 - $TEST -f /bin/sh && exit 1 - $TEST '{' && exit 1 - $TEST '{' && exit 1 - $TEST '/hello/' && exit 1 - $TEST '1,/hello/' && exit 1 - $TEST -e '-5p' && exit 1 - $TEST '/jj' && exit 1 - $TEST 'a hello' && exit 1 - $TEST 'a \ hello' && exit 1 - $TEST 'b foo' && exit 1 - $TEST 'd hello' && exit 1 - $TEST 's/aa' && exit 1 - $TEST 's/aa/' && exit 1 - $TEST 's/a/b' && exit 1 - $TEST 's/a/b/c/d' && exit 1 - $TEST 's/a/b/ 1 2' && exit 1 - $TEST 's/a/b/ 1 g' && exit 1 - $TEST 's/a/b/w' && exit 1 - $TEST 'y/aa' && exit 1 - $TEST 'y/aa/b/' && exit 1 - $TEST 'y/aa/' && exit 1 - $TEST 'y/a/b' && exit 1 - $TEST 'y/a/b/c/d' && exit 1 - $TEST '!' && exit 1 - $TEST supercalifrangolisticexprialidociussupercalifrangolisticexcius - set +x - exec 0>&3 1>&4 2>&5 -} - -main -- 2.11.4.GIT