From owner-svn-src-all@FreeBSD.ORG  Sun Mar  9 19:25:54 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B99CEA06;
 Sun,  9 Mar 2014 19:25:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8D883C02;
 Sun,  9 Mar 2014 19:25:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s29JPsbw013535;
 Sun, 9 Mar 2014 19:25:54 GMT (envelope-from jmmv@svn.freebsd.org)
Received: (from jmmv@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s29JPrhv013532;
 Sun, 9 Mar 2014 19:25:53 GMT (envelope-from jmmv@svn.freebsd.org)
Message-Id: <201403091925.s29JPrhv013532@svn.freebsd.org>
From: Julio Merino <jmmv@FreeBSD.org>
Date: Sun, 9 Mar 2014 19:25:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262953 - head/tools/regression/usr.bin/m4
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Mar 2014 19:25:54 -0000

Author: jmmv
Date: Sun Mar  9 19:25:53 2014
New Revision: 262953
URL: http://svnweb.freebsd.org/changeset/base/262953

Log:
  Fix m4 tests so that they run cleanly with prove.

Modified:
  head/tools/regression/usr.bin/m4/regress.gnusofterror.out
  head/tools/regression/usr.bin/m4/regress.sh
  head/tools/regression/usr.bin/m4/regress.t

Modified: head/tools/regression/usr.bin/m4/regress.gnusofterror.out
==============================================================================
--- head/tools/regression/usr.bin/m4/regress.gnusofterror.out	Sun Mar  9 18:08:27 2014	(r262952)
+++ head/tools/regression/usr.bin/m4/regress.gnusofterror.out	Sun Mar  9 19:25:53 2014	(r262953)
@@ -1 +1,2 @@
+m4: gnusofterror.m4 at line 3: include(hey I do not exit): No such file or directory
 abc

Modified: head/tools/regression/usr.bin/m4/regress.sh
==============================================================================
--- head/tools/regression/usr.bin/m4/regress.sh	Sun Mar  9 18:08:27 2014	(r262952)
+++ head/tools/regression/usr.bin/m4/regress.sh	Sun Mar  9 19:25:53 2014	(r262953)
@@ -2,7 +2,7 @@
 
 LC_ALL=C; export LC_ALL
 
-echo 1..22
+echo 1..21
 
 REGRESSION_START($1)
 
@@ -17,7 +17,7 @@ REGRESSION_TEST(`gnuformat', `m4 -g gnuf
 REGRESSION_TEST(`gnupatterns', `m4 -g gnupatterns.m4')
 REGRESSION_TEST(`gnupatterns2', `m4 -g gnupatterns2.m4')
 REGRESSION_TEST(`gnuprefix', `m4 -P gnuprefix.m4 2>&1')
-REGRESSION_TEST(`gnusofterror', `m4 -g gnusofterror.m4')
+REGRESSION_TEST(`gnusofterror', `m4 -g gnusofterror.m4 2>&1')
 REGRESSION_TEST(`gnutranslit2', `m4 -g translit2.m4')
 REGRESSION_TEST(`includes', `m4 -I. includes.m4')
 REGRESSION_TEST(`m4wrap3', `m4 m4wrap3.m4')

Modified: head/tools/regression/usr.bin/m4/regress.t
==============================================================================
--- head/tools/regression/usr.bin/m4/regress.t	Sun Mar  9 18:08:27 2014	(r262952)
+++ head/tools/regression/usr.bin/m4/regress.t	Sun Mar  9 19:25:53 2014	(r262953)
@@ -3,4 +3,4 @@
 
 cd `dirname $0`
 
-sh regress.sh
+m4 ../regress.m4 regress.sh | sh