Project

General

Profile

« Previous | Next » 

Revision 650

input.Makefile: Don't print "accept test" message when user aborted a test with Ctrl+C

View differences:

inputs/input.Makefile
117 117
testRef = $(1:.2-step.xml=.xml).ref
118 118

  
119 119
define test
120
@{\
121
(set -o pipefail;\
122
(set -x; env test=1 n=$(test_n) $(1) $(if $(+in),<$(+in))\
123
$(+maps) $(if $(2),,>$@) 2>&1)\
124
$(if $(2),| grep -v -E '^$(2)$$' >$@) || { e=$$?; cat $@; exit $$e;})\
125
&& $(DIFF) $(call testRef,$@) $@;\
120
@(set -o pipefail;\
121
{\
122
    (set -x; env test=1 n=$(test_n) $(1) $(if $(+in),<$(+in)) $(+maps)\
123
    $(if $(2),,>$@) 2>&1) $(if $(2),| grep -v -E '^$(2)$$' >$@)\
124
    || { e=$$?; cat $@; exit $$e;};\
125
    $(DIFF) $(call testRef,$@) $@;\
126 126
} || { e=$$?; echo $(emph)"To accept new test output:"$(endEmph);\
127 127
echo "$(MAKE) $@-ok --directory=$(realpath .) --makefile=../input.Makefile";\
128
exit $$e;}
128
exit $$e;}\
129
)
129 130
endef
130 131

  
131 132
test2File = $(call test,$(map),Processed .* input rows)

Also available in: Unified diff