From owner-svn-src-all@FreeBSD.ORG Mon Apr 30 22:00:35 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EC20E1065676; Mon, 30 Apr 2012 22:00:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D5CF98FC15; Mon, 30 Apr 2012 22:00:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3UM0Z8l087252; Mon, 30 Apr 2012 22:00:35 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3UM0Zwm087217; Mon, 30 Apr 2012 22:00:35 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201204302200.q3UM0Zwm087217@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 30 Apr 2012 22:00:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234852 - head/tools/regression/usr.bin/m4 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Apr 2012 22:00:36 -0000 Author: bapt Date: Mon Apr 30 22:00:34 2012 New Revision: 234852 URL: http://svn.freebsd.org/changeset/base/234852 Log: Import m4 regression tests from OpenBSD Obtained from: OpenBSD Approved by: des (mentor) Added: head/tools/regression/usr.bin/m4/args.m4 (contents, props changed) head/tools/regression/usr.bin/m4/args2.m4 (contents, props changed) head/tools/regression/usr.bin/m4/comments.m4 (contents, props changed) head/tools/regression/usr.bin/m4/esyscmd.m4 (contents, props changed) head/tools/regression/usr.bin/m4/eval.m4 (contents, props changed) head/tools/regression/usr.bin/m4/ff_after_dnl.m4.uu (contents, props changed) head/tools/regression/usr.bin/m4/gnueval.m4 (contents, props changed) head/tools/regression/usr.bin/m4/gnuformat.m4 (contents, props changed) head/tools/regression/usr.bin/m4/gnupatterns.m4 (contents, props changed) head/tools/regression/usr.bin/m4/gnupatterns2.m4 (contents, props changed) head/tools/regression/usr.bin/m4/gnuprefix.m4 (contents, props changed) head/tools/regression/usr.bin/m4/gnusofterror.m4 (contents, props changed) head/tools/regression/usr.bin/m4/includes.aux (contents, props changed) head/tools/regression/usr.bin/m4/includes.m4 (contents, props changed) head/tools/regression/usr.bin/m4/m4wrap3.m4 (contents, props changed) head/tools/regression/usr.bin/m4/patterns.m4 (contents, props changed) head/tools/regression/usr.bin/m4/quotes.m4 (contents, props changed) head/tools/regression/usr.bin/m4/redef.m4 (contents, props changed) head/tools/regression/usr.bin/m4/regress.args.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.args2.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.comments.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.esyscmd.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.eval.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.ff_after_dnl.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.gnueval.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.gnuformat.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.gnupatterns.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.gnupatterns2.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.gnuprefix.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.gnusofterror.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.gnutranslit2.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.includes.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.m4wrap3.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.patterns.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.quotes.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.redef.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.strangequotes.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.translit.out (contents, props changed) head/tools/regression/usr.bin/m4/regress.translit2.out (contents, props changed) head/tools/regression/usr.bin/m4/strangequotes.m4.uu (contents, props changed) head/tools/regression/usr.bin/m4/translit.m4 (contents, props changed) head/tools/regression/usr.bin/m4/translit2.m4 (contents, props changed) Deleted: head/tools/regression/usr.bin/m4/regress.changecom.in head/tools/regression/usr.bin/m4/regress.changecom.out head/tools/regression/usr.bin/m4/regress.gchangecom.out Modified: head/tools/regression/usr.bin/m4/Makefile head/tools/regression/usr.bin/m4/regress.sh Modified: head/tools/regression/usr.bin/m4/Makefile ============================================================================== --- head/tools/regression/usr.bin/m4/Makefile Mon Apr 30 21:26:35 2012 (r234851) +++ head/tools/regression/usr.bin/m4/Makefile Mon Apr 30 22:00:34 2012 (r234852) @@ -1,4 +1,4 @@ # $FreeBSD$ all: - @sh ${.CURDIR}/regress.sh ${.CURDIR} + @m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR} Added: head/tools/regression/usr.bin/m4/args.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/args.m4 Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,9 @@ +dnl $FreeBSD$ +dnl $OpenBSD: src/regress/usr.bin/m4/args.m4,v 1.1 2001/10/10 23:23:59 espie Exp $ +dnl Expanding all arguments +define(`A', `first form: $@, second form $*')dnl +define(`B', `C')dnl +A(1,2,`B') +dnl indirection means macro can get called with argc == 2 ! +indir(`A',1,2,`B') +indir(`A') Added: head/tools/regression/usr.bin/m4/args2.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/args2.m4 Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,5 @@ +dnl $FreeBSD$ +dnl $OpenBSD: src/regress/usr.bin/m4/args2.m4,v 1.1 2008/08/16 09:57:12 espie Exp $ +dnl Preserving spaces within nested parentheses +define(`foo',`$1')dnl +foo(( check for embedded spaces)) Added: head/tools/regression/usr.bin/m4/comments.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/comments.m4 Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,59 @@ +dnl $FreeBSD$ +dnl $OpenBSD: src/regress/usr.bin/m4/comments.m4,v 1.1 2005/09/06 15:33:21 espie Exp $ +dnl checking the way changecom works. +1: normal +define(`comment', `COMMENT')dnl +define(`p', 'XXX')dnl +# this is a comment +>> this is a comment +p this is a comment +p this is a comment q comment too + +2: `changecom(>>)dnl' +changecom(>>)dnl +# this is a comment +>> this is a comment +p this is a comment +p this is a comment q comment too + +3: `changecom dnl' +changecom dnl +# this is a comment +>> this is a comment +p this is a comment +p this is a comment q comment too + +4: `changecom()dnl' +changecom()dnl +# this is a comment +>> this is a comment +p this is a comment +p this is a comment q comment too + +5: `changecom(,)dnl' +changecom(,)dnl +# this is a comment +>> this is a comment +p this is a comment +p this is a comment q comment too + +6: `changecom(`p',q)dnl' +changecom(`p',q)dnl +# this is a comment +>> this is a comment +p this is a comment +p this is a comment q comment too + +7: `changecom(`p')dnl' +changecom(`p')dnl +# this is a comment +>> this is a comment +p this is a comment +p this is a comment q comment too + +8: `changecom(#)dnl' +changecom(#)dnl +# this is a comment +>> this is a comment +p this is a comment +p this is a comment q comment too Added: head/tools/regression/usr.bin/m4/esyscmd.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/esyscmd.m4 Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,43 @@ +dnl $FreeBSD$ +changequote(`{',`}')dnl +dnl +esyscmd({sh -c "m4<>>') +patsubst(`# This is a line to zap +# and a second line +keep this one', `^ *#.* +') +dnl Special case: empty regexp +patsubst(`empty regexp',`',`a ') Added: head/tools/regression/usr.bin/m4/quotes.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/quotes.m4 Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,58 @@ +dnl $FreeBSD$ +dnl $OpenBSD: src/regress/usr.bin/m4/quotes.m4,v 1.2 2005/09/06 15:33:21 espie Exp $ +dnl Checking the way changequote() is supposed to work +define(`string',`STRING')dnl +1: normal +`quoted string' +[quoted string] +normal string +`half quoted string +going up to that string' + +2: kill quotes +changequote()dnl +`quoted string' +[quoted string] +normal string +`half quoted string +going up to that string' + +3: normal changed quote +changequote([,])dnl +`quoted string' +[quoted string] +normal string +`half quoted string +going up to that string' + +4: empty quotes, kill them too +changequote(,)dnl +`quoted string' +[quoted string] +normal string +`half quoted string +going up to that string' + +5: start quote only +changequote(`)dnl +`quoted string' +[quoted string] +normal string +`half quoted string +going up to that string' + +6: normal quotes are back +changequote +`quoted string' +[quoted string] +normal string +`half quoted string +going up to that string' + +7: start quote+empty end quote +changequote([,)dnl +`quoted string' +[quoted string] +normal string +`half quoted string +going up to that string' Added: head/tools/regression/usr.bin/m4/redef.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/redef.m4 Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,17 @@ +dnl $FreeBSD$ +dnl $OpenBSD: src/regress/usr.bin/m4/redef.m4,v 1.2 2001/09/27 22:40:58 espie Exp $ +dnl check all properties of builtin are passed on, including args behavior +define(`mybuiltin',defn(`builtin'))dnl +builtin mybuiltin +define(`mydefine',defn(`define'))dnl +mydefine(`mydefn',defn(`defn'))dnl +mydefine(`myundefine',mydefn(`undefine'))dnl +myundefine(`defn')dnl +myundefine(`define')dnl +myundefine(`undefine')dnl +mydefine(`mydef2',mydefn(`mydefine'))dnl +mydefine(`mydef', mydefn(`define'))dnl +myundefine(`mydefine')dnl +mydef2(`A',`B')dnl +mydef(`C',`D')dnl +A C Added: head/tools/regression/usr.bin/m4/regress.args.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/regress.args.out Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,3 @@ +first form: 1,2,B, second form 1,2,C +first form: 1,2,B, second form 1,2,C +first form: , second form Added: head/tools/regression/usr.bin/m4/regress.args2.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/regress.args2.out Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1 @@ +( check for embedded spaces) Added: head/tools/regression/usr.bin/m4/regress.comments.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/regress.comments.out Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,47 @@ +1: normal +# this is a comment +>> this is a COMMENT +'XXX' this is a COMMENT +'XXX' this is a COMMENT q COMMENT too + +2: changecom(>>)dnl +# this is a COMMENT +>> this is a comment +'XXX' this is a COMMENT +'XXX' this is a COMMENT q COMMENT too + +3: changecom dnl + # this is a COMMENT +>> this is a COMMENT +'XXX' this is a COMMENT +'XXX' this is a COMMENT q COMMENT too + +4: changecom()dnl +# this is a COMMENT +>> this is a COMMENT +'XXX' this is a COMMENT +'XXX' this is a COMMENT q COMMENT too + +5: changecom(,)dnl +# this is a COMMENT +>> this is a COMMENT +'XXX' this is a COMMENT +'XXX' this is a COMMENT q COMMENT too + +6: changecom(`p',q)dnl +# this is a COMMENT +>> this is a COMMENT +p this is a comment +p this is a comment q COMMENT too + +7: changecom(`p')dnl +# this is a COMMENT +>> this is a COMMENT +p this is a comment +p this is a comment q comment too + +8: changecom(#)dnl +# this is a comment +>> this is a COMMENT +'XXX' this is a COMMENT +'XXX' this is a COMMENT q COMMENT too Added: head/tools/regression/usr.bin/m4/regress.esyscmd.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/regress.esyscmd.out Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,578 @@ + + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + +hi there a +hi there a + + Added: head/tools/regression/usr.bin/m4/regress.eval.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/regress.eval.out Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,3 @@ +96 +255 +1 Added: head/tools/regression/usr.bin/m4/regress.ff_after_dnl.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/regress.ff_after_dnl.out Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,2 @@ + THIS SHOULD SHOW UP (LINE 1) + THIS SHOULD SHOW UP (LINE 5) Added: head/tools/regression/usr.bin/m4/regress.gnueval.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/regress.gnueval.out Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,3 @@ +65536 +48 +-64 Added: head/tools/regression/usr.bin/m4/regress.gnuformat.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/regress.gnuformat.out Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1 @@ +a stringa%bpouet bctoolongcdtoolong2d Added: head/tools/regression/usr.bin/m4/regress.gnupatterns.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/regress.gnupatterns.out Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1,3 @@ +string with a minus to replace with a minus +string with b to replbce with b b +minusstring with a starting + to replace with a minus Added: head/tools/regression/usr.bin/m4/regress.gnupatterns2.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/m4/regress.gnupatterns2.out Mon Apr 30 22:00:34 2012 (r234852) @@ -0,0 +1 @@ +acosl asinl atanl cosl sinl tanl coshl sinhl tanhl Added: head/tools/regression/usr.bin/m4/regress.gnuprefix.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***