add 'make check' target

Generate *.check files from asciidoc output and grep for WARNINGs.
Add *.check files to gitignore and to 'make clean'.

Change-Id: Ibccc83a3415930a528f2e8e4e4dda3b81c6d0b64
This commit is contained in:
Neels Hofmeyr 2016-10-17 06:15:34 +02:00
parent 4dba500ed5
commit b156e76469
8 changed files with 28 additions and 6 deletions

1
.gitignore vendored
View File

@ -8,4 +8,5 @@
*.html
*__*.png
*__*.svg
*.check
generated/

View File

@ -24,3 +24,13 @@ upload:
cd OsmoSGSN; $(MAKE) upload
cd OsmoNAT; $(MAKE) upload
cd OsmoPCU; $(MAKE) upload
check:
cd OsmoBTS; $(MAKE) check
cd OsmoNITB; $(MAKE) check
cd OsmoBSC; $(MAKE) check
cd OsmoSGSN; $(MAKE) check
cd OsmoPCU; $(MAKE) check
# These don't use asciidoc, so they have no 'make check' target:
#cd OsmoMGCP; $(MAKE) check
#cd OsmoNAT; $(MAKE) check

View File

@ -24,7 +24,7 @@ osmobsc-usermanual.pdf: chapters/*.adoc
clean:
rm -rf $(cleanfiles)
rm -rf osmobsc-usermanual__*.{svg,png}
rm -rf osmobsc-usermanual__*.{svg,png,check}
gen-bsc-vty-docbook: FORCE
$(call command,xsltproc -o generated/combined1.xml \

View File

@ -23,8 +23,8 @@ osmobts-usermanual.pdf: chapters/*.adoc
clean:
rm -rf $(cleanfiles)
rm -rf osmobts-abis__*.{svg,png}
rm -rf osmobts-usermanual__*.{svg,png}
rm -rf osmobts-abis__*.{svg,png,check}
rm -rf osmobts-usermanual__*.{svg,png,check}
gen-bts-vty-docbook: FORCE
$(call command,xsltproc -o generated/combined1.xml \

View File

@ -23,7 +23,7 @@ osmonitb-usermanual.pdf: chapters/*.adoc
clean:
rm -rf $(cleanfiles)
rm -rf osmonitb-usermanual__*.{svg,png}
rm -rf osmonitb-usermanual__*.{svg,png,check}
gen-nitb-vty-docbook: FORCE
$(call command,xsltproc -o generated/combined1.xml \

View File

@ -25,7 +25,7 @@ osmopcu-usermanual.pdf: chapters/*.adoc
clean:
rm -rf $(cleanfiles)
rm -rf gen-vty-docbook
rm -rf osmopcu-usermanual__*.{svg,png}
rm -rf osmopcu-usermanual__*.{svg,png,check}
gen-vty-docbook: FORCE
$(call command,xsltproc -o generated/combined1.xml \

View File

@ -22,7 +22,7 @@ include $(TOPDIR)/build/Makefile.inc
osmosgsn-usermanual.pdf: chapters/*.adoc
clean:
rm -rf osmosgsn-usermanual__*.{svg,png}
rm -rf osmosgsn-usermanual__*.{svg,png,check}
rm -rf $(cleanfiles)
gen-sgsn-vty-docbook: FORCE

View File

@ -9,6 +9,7 @@ GIT_DATE := $(shell $(TOPDIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=
# generate list of PDFs that we're supposed to render
ASCIIDOCPDFS = $(ASCIIDOCS:%=%.pdf)
ASCIIDOC_CHECKS = $(ASCIIDOCS:%=%.check)
ASCIIDOCSTYLE ?= $(BUILDDIR)/custom-dblatex.sty
@ -30,3 +31,13 @@ all: $(ASCIIDOCPDFS)
$(ASCIIDOCPDFS): %.pdf: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc
a2x $(A2X_OPTS) $< || asciidoc -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf $<
check: $(ASCIIDOC_CHECKS)
$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc chapters/*.adoc
asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1
# Make absolutely sure that the %.check target is updated.
touch $@
# Do print the WARNING output but return error if any was found
# (grep -v would omit the WARNING output from the log).
@grep WARNING $@ && exit 1 || exit 0