Revision 884
Added by Aaron Marcuse-Kubitza almost 13 years ago
| inputs/input.Makefile | ||
|---|---|---|
| 4 | 4 |
exts ?= csv xml |
| 5 | 5 |
test_n ?= 2 |
| 6 | 6 |
tablesSort ?= plots organisms stems |
| 7 |
mainCoreMapTry ?= organisms specimens |
|
| 8 | 7 |
|
| 9 | 8 |
##### Vars/functions |
| 10 | 9 |
|
| ... | ... | |
| 71 | 70 |
via := $(firstword $(sort $(basename $(basename $(notdir $(allViaMaps)))))) |
| 72 | 71 |
|
| 73 | 72 |
coreMap := $(mappings)/$(via)-VegBIEN.%.csv |
| 74 |
mainCoreMap := $(firstword $(wildcard $(mainCoreMapTry:%=$(coreMap)))) |
|
| 75 | 73 |
|
| 76 | 74 |
viaMaps := $(wildcard $(tablesSort:%=maps/$(via).%.csv)) |
| 77 | 75 |
viaMaps += $(filter-out $(viaMaps),$(wildcard maps/$(via).*.csv)) |
| ... | ... | |
| 189 | 187 |
$(test2File) |
| 190 | 188 |
tests += test/VegBIEN.%.xml |
| 191 | 189 |
|
| 192 |
test/VegBIEN.%.2-step.xml: test/$(via).%.xml $(mainCoreMap) _always
|
|
| 190 |
test/VegBIEN.%.2-step.xml: test/$(via).%.xml $(coreMap) _always
|
|
| 193 | 191 |
-$(test2File) |
| 194 | 192 |
# Don't abort tester if only 2-step test fails, as it's often finicky |
| 195 | 193 |
tests += test/VegBIEN.%.2-step.xml |
Also available in: Unified diff
input.Makefile: test/VegBIEN.%.2-step.xml: Use the core map specific to the test's table instead of the main core map