Project

General

Profile

« Previous | Next » 

Revision 656

input.Makefile: Generate VegBIEN.2-step.xml correctly from VegX.xml, by removing DB config env vars passed to map for that test case. Note that this causes the VegBIEN.2-step.xml test to fail, because the 2-step mapping does not yet match the 1-step mapping.

View differences:

input.Makefile
124 124
exit $$e;}
125 125
endef
126 126

  
127
test2File = $(call test,$(map))
128
test2Db = $(call test,$(import))
129

  
130 127
test/VegX.xml: $(vegxMaps) _always
131
	$(test2File)
128
	$(call test,$(map))
132 129

  
133 130
test/VegBIEN.xml: $(vegbienMaps) _always
134
	$(test2File)
131
	$(call test,$(map))
135 132

  
136
test/VegBIEN.2-step.xml: test/VegX.xml $(vegbienMaps) _always
137
	$(test2File)
133
test/VegBIEN.2-step.xml: test/VegX.xml\
134
$(root)/mappings/VegX-VegBIEN.organisms.csv _always
135
	$(call test,$(root)/map)
138 136

  
139 137
test/import.out: $(vegbienMaps) _always
140
	$(test2Db)
138
	$(call test,$(import))
141 139

  
142 140
# Accepts a test output: make <test_output_path>-ok
143 141
%-ok: _always

Also available in: Unified diff