Revision 652
Added by Aaron Marcuse-Kubitza over 12 years ago
| inputs/SALVIAS/test/VegX.xml.ref | ||
|---|---|---|
| 1 |
Connecting to MySQL database SALVIAS...Done |
|
| 2 |
Connecting to MySQL database SALVIAS...Done |
|
| 3 |
Connecting to MySQL database SALVIAS...Done |
|
| 4 | 1 |
<?xml version="1.0" ?> |
| 5 | 2 |
<VegX> |
| 6 | 3 |
<plotObservations> |
| inputs/SALVIAS/test/VegBIEN.xml.ref | ||
|---|---|---|
| 1 |
Connecting to MySQL database SALVIAS...Done |
|
| 2 |
Connecting to MySQL database SALVIAS...Done |
|
| 3 |
Connecting to MySQL database SALVIAS...Done |
|
| 4 | 1 |
<?xml version="1.0" ?> |
| 5 | 2 |
<VegBIEN> |
| 6 | 3 |
<locationevent id="0"> |
| inputs/input.Makefile | ||
|---|---|---|
| 117 | 117 |
testRef = $(1:.2-step.xml=.xml).ref |
| 118 | 118 |
|
| 119 | 119 |
define test |
| 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 |
} || { e=$$?; echo $(emph)"To accept new test output:"$(endEmph);\
|
|
| 120 |
set -o pipefail; env test=1 n=$(test_n) $(1) $(if $(+in),<$(+in)) $(+maps) 2>&1\ |
|
| 121 |
>$@ | tee -a $@.err |
|
| 122 |
@(set -x; $(DIFF) $(call testRef,$@) $@) || { e=$$?;\
|
|
| 123 |
echo $(emph)"To accept new test output:"$(endEmph);\ |
|
| 127 | 124 |
echo "$(MAKE) $@-ok --directory=$(realpath .) --makefile=../input.Makefile";\ |
| 128 |
exit $$e;}\ |
|
| 129 |
) |
|
| 125 |
exit $$e;} |
|
| 130 | 126 |
endef |
| 131 | 127 |
|
| 132 | 128 |
test2File = $(call test,$(map),Processed .* input rows) |
Also available in: Unified diff
input.Makefile: Write test stderr to .err file instead of test output, and tee it to stdout of the make process