summaryrefslogtreecommitdiffstats
path: root/tools/regression
diff options
context:
space:
mode:
authorjmmv <jmmv@FreeBSD.org>2014-03-09 19:25:53 +0000
committerjmmv <jmmv@FreeBSD.org>2014-03-09 19:25:53 +0000
commit2555572f0ced8dbf64b4a016e678b92bd1cca412 (patch)
tree9a223a0e4b9fe8037d88e1c2430a289d36053336 /tools/regression
parent3b592f9410a74f60bfae632b7fe97fd3b544ae9f (diff)
downloadFreeBSD-src-2555572f0ced8dbf64b4a016e678b92bd1cca412.zip
FreeBSD-src-2555572f0ced8dbf64b4a016e678b92bd1cca412.tar.gz
Fix m4 tests so that they run cleanly with prove.
Diffstat (limited to 'tools/regression')
-rw-r--r--tools/regression/usr.bin/m4/regress.gnusofterror.out1
-rw-r--r--tools/regression/usr.bin/m4/regress.sh4
-rw-r--r--tools/regression/usr.bin/m4/regress.t2
3 files changed, 4 insertions, 3 deletions
diff --git a/tools/regression/usr.bin/m4/regress.gnusofterror.out b/tools/regression/usr.bin/m4/regress.gnusofterror.out
index 8baef1b..322fa4c 100644
--- a/tools/regression/usr.bin/m4/regress.gnusofterror.out
+++ b/tools/regression/usr.bin/m4/regress.gnusofterror.out
@@ -1 +1,2 @@
+m4: gnusofterror.m4 at line 3: include(hey I do not exit): No such file or directory
abc
diff --git a/tools/regression/usr.bin/m4/regress.sh b/tools/regression/usr.bin/m4/regress.sh
index 198cfa2..6f22f7d 100644
--- a/tools/regression/usr.bin/m4/regress.sh
+++ b/tools/regression/usr.bin/m4/regress.sh
@@ -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 gnuformat.m4')
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')
diff --git a/tools/regression/usr.bin/m4/regress.t b/tools/regression/usr.bin/m4/regress.t
index c36d834..a82aacd 100644
--- a/tools/regression/usr.bin/m4/regress.t
+++ b/tools/regression/usr.bin/m4/regress.t
@@ -3,4 +3,4 @@
cd `dirname $0`
-sh regress.sh
+m4 ../regress.m4 regress.sh | sh
OpenPOWER on IntegriCloud