Merge pull request #1921 from masatake/verify-input-base

verify-input target derrived from #1909

Units/simple-json.d/verifier

@@ -0,0 +1 @@
+jq

circle.yml

@@ -14,6 +14,7 @@ jobs:
            name: Install build tools
            command: |
              dnf -y install gcc automake autoconf pkgconfig bmake aspell-devel aspell-en libxml2-devel jansson-devel libyaml-devel findutils || :
+             dnf -y install jq
        - run:
            name: Build
            command: |
@@ -23,7 +24,7 @@ jobs:
        - run:
            name: Test
            command: |
-             MAKE=bmake bmake check roundtrip CIRCLECI=1
+             MAKE=bmake bmake verify-input check roundtrip CIRCLECI=1
    centos_make:
      working_directory: ~/universal-ctags
      docker:

makefiles/help.mak

@@ -24,3 +24,10 @@ help:
 	@echo "CATEGORIES=<category>             - Only run tests available under folder Units/<category>.r"
 	@echo "UNITS=<case>[,<case>]             - Only run tests named Units/[category.r/]/<case>.d in units target"
 	@echo "                                                         Tmain/<case>.d in tmain target"
+	@echo ""
+	@echo "Input verification target:"
+	@echo ""
+	@echo "make verify-input                 - Verify the input files themselves, not ctags"
+	@echo
+	@echo "Arguments that can be used in input verification target:"
+	@echo "VERIFIERS=<verifier>,[<verifier>] - Verify only input files expecting verified by VERIFIERs"

makefiles/testing.mak

@@ -1,5 +1,5 @@
 # -*- makefile -*-
-.PHONY: check units fuzz noise tmain tinst clean-units clean-tmain clean-gcov run-gcov codecheck cppcheck dicts cspell
+.PHONY: check units fuzz noise tmain tinst clean-units clean-tmain clean-gcov run-gcov codecheck cppcheck dicts cspell verify-input
 
 check: tmain units
 
@@ -120,6 +120,21 @@ clean-units:
 		$(SHELL) $(srcdir)/misc/units clean $${builddir}/Units
 
 #
+# VERIFY-INPUT Target
+#
+verify-input:
+	$(V_RUN) \
+	if test -n "$${ZSH_VERSION+set}"; then set -o SH_WORD_SPLIT; fi; \
+	if test x$(VG) = x1; then		\
+		VALGRIND=--with-valgrind;	\
+	fi;					\
+	if test -n "$(VERIFIERS)"; then	\
+		VERIFIERS="--verifiers=$(VERIFIERS)"; \
+	fi; \
+	c="$(srcdir)/misc/units verify-input $${VERIFIERS}"; \
+	TRAVIS=$(TRAVIS) APPVEYOR=$(APPVEYOR) CIRCLECI=$(CIRCLECI)\
+		$(SHELL) $${c} $(srcdir)/Units $(srcdir)/misc/verifiers
+#
 # Test main part, not parsers
 #
 tmain: $(CTAGS_TEST)