Skip to content

Commit

Permalink
Merge pull request #1930 from masatake/rename--verifier--to--validator
Browse files Browse the repository at this point in the history
input-validate: rename input-verify
  • Loading branch information
masatake committed Nov 4, 2018
2 parents 28e5daa + e539932 commit ed9b58d
Show file tree
Hide file tree
Showing 8 changed files with 158 additions and 158 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- run:
name: Test
command: |
MAKE=bmake bmake verify-input check roundtrip CIRCLECI=1
MAKE=bmake bmake validate-input check roundtrip CIRCLECI=1
centos_make:
working_directory: ~/universal-ctags
docker:
Expand Down
8 changes: 4 additions & 4 deletions makefiles/help.mak
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ help:
@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 "Input validation target:"
@echo ""
@echo "make verify-input - Verify the input files themselves, not ctags"
@echo "make validate-input - Validate 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"
@echo "Arguments that can be used in input validation target:"
@echo "VALIDATORS=<validator>,[<validator>] - Validate only input files expecting validated by VALIDATORs"
14 changes: 7 additions & 7 deletions makefiles/testing.mak
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- makefile -*-
.PHONY: check units fuzz noise tmain tinst clean-units clean-tmain clean-gcov run-gcov codecheck cppcheck dicts cspell verify-input
.PHONY: check units fuzz noise tmain tinst clean-units clean-tmain clean-gcov run-gcov codecheck cppcheck dicts cspell validate-input

check: tmain units

Expand Down Expand Up @@ -120,20 +120,20 @@ clean-units:
$(SHELL) $(srcdir)/misc/units clean $${builddir}/Units

#
# VERIFY-INPUT Target
# VALIDATE-INPUT Target
#
verify-input:
validate-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)"; \
if test -n "$(VALIDATORS)"; then \
VALIDATORS="--validators=$(VALIDATORS)"; \
fi; \
c="$(srcdir)/misc/units verify-input $${VERIFIERS}"; \
c="$(srcdir)/misc/units validate-input $${VALIDATORS}"; \
TRAVIS=$(TRAVIS) APPVEYOR=$(APPVEYOR) CIRCLECI=$(CIRCLECI)\
$(SHELL) $${c} $(srcdir)/Units $(srcdir)/misc/verifiers
$(SHELL) $${c} $(srcdir)/Units $(srcdir)/misc/validators
#
# Test main part, not parsers
#
Expand Down
Loading

0 comments on commit ed9b58d

Please sign in to comment.