svn commit: r262953 - head/tools/regression/usr.bin/m4

Julio Merino jmmv at FreeBSD.org
Sun Mar 9 19:25:54 UTC 2014


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


More information about the svn-src-all mailing list