Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=6b37cab7b... Commit: 6b37cab7bc7fe41ce313d947b9c409c994c23451 Parent: db222f1c01abe4dadbf5a70a8fcd67dc0df83b43 Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Thu Jan 8 21:38:37 2015 +0100 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Thu Jan 8 21:38:37 2015 +0100
[build] Replace using $AWK for different use then awk binary
--- make/agentpycheck.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/make/agentpycheck.mk b/make/agentpycheck.mk index 090116b..291e242 100644 --- a/make/agentpycheck.mk +++ b/make/agentpycheck.mk @@ -1,19 +1,19 @@ TEMPFILE:=$(shell mktemp) #DATADIR:=$(abs_top_builddir)/tests/data/metadata DATADIR:=$(abs_top_srcdir)/tests/data/metadata -AWK='BEGIN {store=-1} /name="store_path"/ {store=2} {if (store!=0) {print}; store--}' +AWK_VAL='BEGIN {store=-1} /name="store_path"/ {store=2} {if (store!=0) {print}; store--}'
check: $(TARGET:%=xml-check.%) $(SYMTARGET:%=xml-check.%) $(TARGET:%=delay-check.%)
xml-check.%: % $(eval INPUT=$(subst xml-check.,,$@)) - PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | awk $(AWK) > $(TEMPFILE) + PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | $(AWK) $(AWK_VAL) > $(TEMPFILE) diff $(TEMPFILE) $(DATADIR)/$(INPUT).xml rm $(TEMPFILE)
xml-upload.%: % $(eval INPUT=$(subst xml-upload.,,$@)) - PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | awk $(AWK) > $(DATADIR)/$(INPUT).xml + PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | $(AWK) $(AWK_VAL) > $(DATADIR)/$(INPUT).xml
# If test will fail, rerun fence agents to show problems delay-check.%: %
cluster-commits@lists.fedorahosted.org