Revision 897
Added by Aaron Marcuse-Kubitza over 12 years ago
| inputs/input.Makefile | ||
|---|---|---|
| 159 | 159 |
hasOwnRef = $(filter-out %.2-step.xml,$@) |
| 160 | 160 |
testRef = $(1:.2-step.xml=.xml).ref |
| 161 | 161 |
|
| 162 |
define test
|
|
| 162 |
define runTest
|
|
| 163 | 163 |
@echo "Testing $(abspath $@)..." |
| 164 | 164 |
>$@ env test=1 verbose=1 n=$(test_n) $(1) |
| 165 | 165 |
@(set -x; $(DIFF) $(call testRef,$@) $@) 2>&1 || { e=$$?;\
|
| ... | ... | |
| 175 | 175 |
exit $$e;} |
| 176 | 176 |
endef |
| 177 | 177 |
|
| 178 |
test2File = $(call test,$(map))
|
|
| 178 |
test2File = $(call runTest,$(map))
|
|
| 179 | 179 |
|
| 180 | 180 |
tests := |
| 181 | 181 |
|
| ... | ... | |
| 193 | 193 |
tests += test/VegBIEN.%.2-step.xml |
| 194 | 194 |
|
| 195 | 195 |
test/import.%.out: maps/VegBIEN.%.csv _always |
| 196 |
$(call test,$(map2db))
|
|
| 196 |
$(call runTest,$(map2db))
|
|
| 197 | 197 |
tests += test/import.%.out |
| 198 | 198 |
|
| 199 | 199 |
.PRECIOUS: $(tests) |
Also available in: Unified diff
input.Makefile: Renamed $(test) variable (containing the command to run a test) so it wouldn't conflict with test environment variable