provide the regression suite for 1.13, too

2 files changed, 46 insertions, 9 deletions

diff --git a/INSTALL b/INSTALL
index 7afa1e90..b522303a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-$Id: INSTALL,v 1.15.2.2 2017/02/21 17:04:04 schwarze Exp $
+$Id: INSTALL,v 1.15.2.3 2017/02/21 17:57:33 schwarze Exp $
 
 About mdocml, the portable mandoc distribution
 ----------------------------------------------
@@ -32,8 +32,8 @@ system, please consult your operating system documentation.
 To install mandoc manually, the following steps are needed:
 
 1. If you want to build the CGI program, man.cgi(8), too,
-run the command "echo BUILD_CGI=1 > configure.local".
-Then run "cp cgi.h.examples cgi.h" and edit cgi.h as desired.
+run the command "echo BUILD_CGI=1 >> configure.local".
+Then run "cp cgi.h.example cgi.h" and edit cgi.h as desired.
 
 2. Run "./configure".
 This script attempts autoconfiguration of mandoc for your system.
@@ -54,24 +54,29 @@ and go back to step 2.
 installed to the intended places.  Otherwise, put some *DIR or *NM*
 variables into "configure.local" and go back to step 2.
 
-5. Run "sudo make install".  If you intend to build a binary
+5. Optionally run the regression suite.
+Basically, that amounts to "cd regress && ./regress.pl".
+But you should probably look at "./mandoc -l regress/regress.pl.1"
+first.
+
+6. Run "sudo make install".  If you intend to build a binary
 package using some kind of fake root mechanism, you may need a
 command like "make DESTDIR=... install".  Read the *-install targets
 in the "Makefile" to understand how DESTDIR is used.
 
-6. If you want to use the integrated man(1) and your system uses
+7. If you want to use the integrated man(1) and your system uses
 manpath(1), make sure it is configured correctly, in particular,
 it returns all directory trees where manual pages are installed.
 Otherwise, if your system uses man.conf(5), make sure it contains
 a "manpath" line for each directory tree, and the order of these
 lines meets your wishes.
 
-7. Run the command "sudo makewhatis" to build mandoc.db(5) databases
+8. Run the command "sudo makewhatis" to build mandoc.db(5) databases
 in all the directory trees configured in step 6.  Whenever installing
 new manual pages, re-run makewhatis(8) to update the databases, or
 apropos(1) will not find the new pages.
 
-8. To set up a man.cgi(8) server, read its manual page.
+9. To set up a man.cgi(8) server, read its manual page.
 
 Note that some man(7) pages may contain low-level roff(7) markup
 that mandoc does not yet understand.  On some BSD systems using
diff --git a/Makefile b/Makefile
index 18b6d980..8d9c36c7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.488.2.8 2017/02/21 17:04:04 schwarze Exp $
+# $Id: Makefile,v 1.488.2.9 2017/02/21 17:57:33 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -282,6 +282,7 @@ WWW_MANS	 = apropos.1.html \
 		   man.1.html \
 		   mandoc.1.html \
 		   soelim.1.html \
+		   man.cgi.3.html \
 		   mandoc.3.html \
 		   mandoc_escape.3.html \
 		   mandoc_headers.3.html \
@@ -299,7 +300,6 @@ WWW_MANS	 = apropos.1.html \
 		   roff.7.html \
 		   tbl.7.html \
 		   makewhatis.8.html \
-		   man.cgi.3.html \
 		   man.cgi.8.html \
 		   man.h.html \
 		   manconf.h.html \
@@ -437,6 +437,12 @@ uninstall:
 	rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h
 	rmdir $(DESTDIR)$(INCLUDEDIR)
 
+regress: all
+	cd regress && ./regress.pl
+
+regress-clean:
+	cd regress && ./regress.pl . clean
+
 Makefile.local config.h: configure $(TESTSRCS)
 	@echo "$@ is out of date; please run ./configure"
 	@exit 1
@@ -477,14 +483,40 @@ depend: config.h
 		Makefile.depend > Makefile.tmp
 	mv Makefile.tmp Makefile.depend
 
+regress-distclean:
+	@find regress \
+		-name '.#*' -o \
+		-name '*.orig' -o \
+		-name '*.rej' -o \
+		-name '*.core' \
+		-exec rm -i {} \;
+
+regress-distcheck:
+	@find regress ! -type d ! -type f
+	@find regress -type f \
+		! -path '*/CVS/*' \
+		! -name Makefile \
+		! -name Makefile.inc \
+		! -name '*.in' \
+		! -name '*.out_ascii' \
+		! -name '*.out_utf8' \
+		! -name '*.out_html' \
+		! -name '*.out_lint' \
+		! -path regress/regress.pl \
+		! -path regress/regress.pl.1
+
 dist: mdocml.sha256
 
 mdocml.sha256: mdocml.tar.gz
 	sha256 mdocml.tar.gz > $@
 
 mdocml.tar.gz: $(DISTFILES)
+	ls regress/*/*/*.mandoc_* && exit 1 || true
 	mkdir -p .dist/mdocml-$(VERSION)/
 	$(INSTALL) -m 0644 $(DISTFILES) .dist/mdocml-$(VERSION)
+	cp -pR regress .dist/mdocml-$(VERSION)
+	find .dist/mdocml-$(VERSION)/regress \
+	    -type d -name CVS -print0 | xargs -0 rm -rf
 	chmod 755 .dist/mdocml-$(VERSION)/configure
 	( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
 	rm -rf .dist/