Skip to content

Commit 496304c

Browse files
nikomatsakisnikomatsakis
committed
---
yaml --- r: 6303 b: refs/heads/master c: 36ab948 h: refs/heads/master i: 6301: 2f8f04b 6299: 3100ee0 6295: 9320aa3 6287: f3f88a8 6271: ea279e1 v: v3
1 parent 33cb24d commit 496304c

File tree

2 files changed

+76
-68
lines changed

2 files changed

+76
-68
lines changed

‎[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 59e2a0a9c1434db65afc6c94752de3cf2ab761a0
2+
refs/heads/master: 36ab948bfaf9f19dd830a9e802dde0a43659d981

‎trunk/mk/tests.mk

+75-67
Original file line numberDiff line numberDiff line change
@@ -106,195 +106,203 @@ tidy:
106106
define TEST_STAGEN
107107

108108
# All the per-stage build rules you might want to call from the
109-
# command line
109+
# command line.
110+
#
111+
# $(1) is the stage number
112+
# $(2) is the target triple
110113

111-
check-stage$(1): tidy \
112-
check-stage$(1)-rustc \
113-
check-stage$(1)-std \
114-
check-stage$(1)-rpass \
115-
check-stage$(1)-rfail \
116-
check-stage$(1)-cfail \
117-
check-stage$(1)-bench \
118-
check-stage$(1)-pretty
114+
check-stage$(1)-$(2): tidy \
115+
check-stage$(1)-$(2)-rustc \
116+
check-stage$(1)-$(2)-std \
117+
check-stage$(1)-$(2)-rpass \
118+
check-stage$(1)-$(2)-rfail \
119+
check-stage$(1)-$(2)-cfail \
120+
check-stage$(1)-$(2)-bench \
121+
check-stage$(1)-$(2)-pretty
119122

120-
check-stage$(1)-std: check-stage$(1)-std-dummy
123+
check-stage$(1)-$(2)-std: check-stage$(1)-$(2)-std-dummy
121124

122-
check-stage$(1)-rustc: check-stage$(1)-rustc-dummy
125+
check-stage$(1)-$(2)-rustc: check-stage$(1)-$(2)-rustc-dummy
123126

124-
check-stage$(1)-cfail: check-stage$(1)-cfail-dummy
127+
check-stage$(1)-$(2)-cfail: check-stage$(1)-$(2)-cfail-dummy
125128

126-
check-stage$(1)-rfail: check-stage$(1)-rfail-dummy
129+
check-stage$(1)-$(2)-rfail: check-stage$(1)-$(2)-rfail-dummy
127130

128-
check-stage$(1)-rpass: check-stage$(1)-rpass-dummy
131+
check-stage$(1)-$(2)-rpass: check-stage$(1)-$(2)-rpass-dummy
129132

130-
check-stage$(1)-bench: check-stage$(1)-bench-dummy
133+
check-stage$(1)-$(2)-bench: check-stage$(1)-$(2)-bench-dummy
131134

132-
check-stage$(1)-perf: check-stage$(1)-perf-dummy
135+
check-stage$(1)-$(2)-perf: check-stage$(1)-$(2)-perf-dummy
133136

134-
check-stage$(1)-pretty: check-stage$(1)-pretty-rpass \
135-
check-stage$(1)-pretty-rfail \
136-
check-stage$(1)-pretty-bench \
137-
check-stage$(1)-pretty-pretty
137+
check-stage$(1)-$(2)-pretty: check-stage$(1)-$(2)-pretty-rpass \
138+
check-stage$(1)-$(2)-pretty-rfail \
139+
check-stage$(1)-$(2)-pretty-bench \
140+
check-stage$(1)-$(2)-pretty-pretty
138141

139-
check-stage$(1)-pretty-rpass: check-stage$(1)-pretty-rpass-dummy
142+
check-stage$(1)-$(2)-pretty-rpass: check-stage$(1)-$(2)-pretty-rpass-dummy
140143

141-
check-stage$(1)-pretty-rfail: check-stage$(1)-pretty-rfail-dummy
144+
check-stage$(1)-$(2)-pretty-rfail: check-stage$(1)-$(2)-pretty-rfail-dummy
142145

143-
check-stage$(1)-pretty-bench: check-stage$(1)-pretty-bench-dummy
146+
check-stage$(1)-$(2)-pretty-bench: check-stage$(1)-$(2)-pretty-bench-dummy
144147

145-
check-stage$(1)-pretty-pretty: check-stage$(1)-pretty-pretty-dummy
148+
check-stage$(1)-$(2)-pretty-pretty: check-stage$(1)-$(2)-pretty-pretty-dummy
146149

147150

148151
# Rules for the standard library test runner
149152

150-
test/stdtest.stage$(1)$$(X): $$(STDTEST_CRATE) $$(STDTEST_INPUTS) \
153+
test/stdtest.stage$(1)-$(2)$$(X): $$(STDTEST_CRATE) $$(STDTEST_INPUTS) \
151154
$$(SREQ$(1)$$(CFG_HOST_TRIPLE))
152155
@$$(call E, compile_and_link: $$@)
153-
$$(STAGE$(1)_$$(CFG_HOST_TRIPLE)) -o $$@ $$< --test
156+
$$(STAGE$(1)_$(2)) -o $$@ $$< --test
154157

155-
check-stage$(1)-std-dummy: test/stdtest.stage$(1)$$(X)
158+
check-stage$(1)-$(2)-std-dummy: test/stdtest.stage$(1)-$(2)$$(X)
156159
@$$(call E, run: $$<)
157160
$$(Q)$$(call CFG_RUN_TEST,$$<) $$(TESTARGS)
158161

159162

160163
# Rules for the rustc test runner
161164

162-
test/rustctest.stage$(1)$$(X): \
165+
test/rustctest.stage$(1)-$(2)$$(X): \
163166
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
164167
$$(TARGET_SREQ$(1)$$(CFG_HOST_TRIPLE)) \
165-
$$(HOST_LIB$(1))/$$(CFG_RUSTLLVM) \
166-
$$(TARGET_LIB$(1)$$(CFG_HOST_TRIPLE))/$$(CFG_RUSTLLVM) \
167-
$$(TARGET_LIB$(1)$$(CFG_HOST_TRIPLE))/$$(CFG_STDLIB)
168+
$$(HOST_LIB$(1))/$$(CFG_RUSTLLVM) \
169+
$$(TARGET_LIB$(1)$(2))/$$(CFG_RUSTLLVM) \
170+
$$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB)
168171
@$$(call E, compile_and_link: $$@)
169-
$$(STAGE$(1)_$$(CFG_HOST_TRIPLE)) -o $$@ $$< --test
172+
$$(STAGE$(1)_$(2)) -o $$@ $$< --test
170173

171-
check-stage$(1)-rustc-dummy: test/rustctest.stage$(1)$$(X)
174+
check-stage$(1)-$(2)-rustc-dummy: test/rustctest.stage$(1)-$(2)$$(X)
172175
@$$(call E, run: $$<)
173176
$$(Q)$$(call CFG_RUN_TEST,$$<) \
174177
$$(TESTARGS)
175178

176179

177180
# Rules for the cfail/rfail/rpass/bench/perf test runner
178181

179-
CTEST_COMMON_ARGS$(1) := --compile-lib-path $$(HOST_LIB$(1)) \
182+
CTEST_COMMON_ARGS$(1)-$(2) := --compile-lib-path $$(HOST_LIB$(1)) \
180183
--run-lib-path $$(TARGET_LIB$(1)$$(CFG_HOST_TRIPLE)) \
181184
--rustc-path $$(HOST_BIN$(1))/rustc$$(X) \
182-
--stage-id stage$(1) \
183-
--rustcflags "$$(CFG_RUSTC_FLAGS)" \
185+
--stage-id stage$(1)-$(2) \
186+
--rustcflags "$$(CFG_RUSTC_FLAGS) --target=$(2)" \
184187
$$(CTEST_TESTARGS) \
185188

186-
CFAIL_ARGS$(1) := $$(CTEST_COMMON_ARGS$(1)) \
189+
CFAIL_ARGS$(1)-$(2) := $$(CTEST_COMMON_ARGS$(1)-$(2)) \
187190
--src-base $$(S)src/test/compile-fail/ \
188191
--build-base test/compile-fail/ \
189192
--mode compile-fail \
190193

191-
RFAIL_ARGS$(1) := $$(CTEST_COMMON_ARGS$(1)) \
194+
RFAIL_ARGS$(1)-$(2) := $$(CTEST_COMMON_ARGS$(1)-$(2)) \
192195
--src-base $$(S)src/test/run-fail/ \
193196
--build-base test/run-fail/ \
194197
--mode run-fail \
195198
$$(CTEST_RUNTOOL) \
196199

197-
RPASS_ARGS$(1) := $$(CTEST_COMMON_ARGS$(1)) \
200+
RPASS_ARGS$(1)-$(2) := $$(CTEST_COMMON_ARGS$(1)-$(2)) \
198201
--src-base $$(S)src/test/run-pass/ \
199202
--build-base test/run-pass/ \
200203
--mode run-pass \
201204
$$(CTEST_RUNTOOL) \
202205

203-
BENCH_ARGS$(1) := $$(CTEST_COMMON_ARGS$(1)) \
206+
BENCH_ARGS$(1)-$(2) := $$(CTEST_COMMON_ARGS$(1)-$(2)) \
204207
--src-base $$(S)src/test/bench/ \
205208
--build-base test/bench/ \
206209
--mode run-pass \
207210
$$(CTEST_RUNTOOL) \
208211

209-
PERF_ARGS$(1) := $$(CTEST_COMMON_ARGS$(1)) \
212+
PERF_ARGS$(1)-$(2) := $$(CTEST_COMMON_ARGS$(1)-$(2)) \
210213
--src-base $$(S)src/test/bench/ \
211214
--build-base test/perf/ \
212215
--mode run-pass \
213216
$$(CTEST_PERF_RUNTOOL) \
214217

215-
PRETTY_RPASS_ARGS$(1) := $$(CTEST_COMMON_ARGS$(1)) \
218+
PRETTY_RPASS_ARGS$(1)-$(2) := $$(CTEST_COMMON_ARGS$(1)-$(2)) \
216219
--src-base $$(S)src/test/run-pass/ \
217220
--build-base test/run-pass/ \
218221
--mode pretty \
219222

220-
PRETTY_RFAIL_ARGS$(1) := $$(CTEST_COMMON_ARGS$(1)) \
223+
PRETTY_RFAIL_ARGS$(1)-$(2) := $$(CTEST_COMMON_ARGS$(1)-$(2)) \
221224
--src-base $$(S)src/test/run-fail/ \
222225
--build-base test/run-fail/ \
223226
--mode pretty \
224227

225-
PRETTY_BENCH_ARGS$(1) := $$(CTEST_COMMON_ARGS$(1)) \
228+
PRETTY_BENCH_ARGS$(1)-$(2) := $$(CTEST_COMMON_ARGS$(1)-$(2)) \
226229
--src-base $$(S)src/test/bench/ \
227230
--build-base test/bench/ \
228231
--mode pretty \
229232

230-
PRETTY_PRETTY_ARGS$(1) := $$(CTEST_COMMON_ARGS$(1)) \
233+
PRETTY_PRETTY_ARGS$(1)-$(2) := $$(CTEST_COMMON_ARGS$(1)-$(2)) \
231234
--src-base $$(S)src/test/pretty/ \
232235
--build-base test/pretty/ \
233236
--mode pretty \
234237

235-
check-stage$(1)-cfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
238+
check-stage$(1)-$(2)-cfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
236239
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
237240
$$(CFAIL_TESTS)
238241
@$$(call E, run: $$<)
239-
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(CFAIL_ARGS$(1))
242+
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(CFAIL_ARGS$(1)-$(2))
240243

241-
check-stage$(1)-rfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
244+
check-stage$(1)-$(2)-rfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
242245
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
243246
$$(RFAIL_TESTS)
244247
@$$(call E, run: $$<)
245-
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(RFAIL_ARGS$(1))
248+
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(RFAIL_ARGS$(1)-$(2))
246249

247-
check-stage$(1)-rpass-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
250+
check-stage$(1)-$(2)-rpass-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
248251
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
249252
$$(RPASS_TESTS)
250253
@$$(call E, run: $$<)
251-
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(RPASS_ARGS$(1))
254+
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(RPASS_ARGS$(1)-$(2))
252255

253-
check-stage$(1)-bench-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
256+
check-stage$(1)-$(2)-bench-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
254257
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
255258
$$(BENCH_TESTS)
256259
@$$(call E, run: $$<)
257-
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(BENCH_ARGS$(1))
260+
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(BENCH_ARGS$(1)-$(2))
258261

259-
check-stage$(1)-perf-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
262+
check-stage$(1)-$(2)-perf-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
260263
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
261264
$$(BENCH_TESTS)
262265
@$$(call E, perf: $$<)
263-
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PERF_ARGS$(1))
266+
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PERF_ARGS$(1)-$(2))
264267

265-
check-stage$(1)-pretty-rpass-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
268+
check-stage$(1)-$(2)-pretty-rpass-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
266269
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
267270
$$(RPASS_TESTS)
268271
@$$(call E, run: $$<)
269-
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_RPASS_ARGS$(1))
272+
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_RPASS_ARGS$(1)-$(2))
270273

271-
check-stage$(1)-pretty-rfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
274+
check-stage$(1)-$(2)-pretty-rfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
272275
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
273276
$$(RFAIL_TESTS)
274277
@$$(call E, run: $$<)
275-
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_RFAIL_ARGS$(1))
278+
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_RFAIL_ARGS$(1)-$(2))
276279

277-
check-stage$(1)-pretty-bench-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
280+
check-stage$(1)-$(2)-pretty-bench-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
278281
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
279282
$$(BENCH_TESTS)
280283
@$$(call E, run: $$<)
281-
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_BENCH_ARGS$(1))
284+
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_BENCH_ARGS$(1)-$(2))
282285

283-
check-stage$(1)-pretty-pretty-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
286+
check-stage$(1)-$(2)-pretty-pretty-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \
284287
$$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \
285288
$$(PRETTY_TESTS)
286289
@$$(call E, run: $$<)
287-
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_PRETTY_ARGS$(1))
290+
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_PRETTY_ARGS$(1)-$(2))
288291

289292
endef
290293

291294
# Instantiate the template for stage 0, 1, 2, 3
292295

293-
$(eval $(call TEST_STAGEN,0))
294-
$(eval $(call TEST_STAGEN,1))
295-
$(eval $(call TEST_STAGEN,2))
296-
$(eval $(call TEST_STAGEN,3))
296+
$(foreach target,$(CFG_TARGET_TRIPLES), \
297+
$(eval $(call TEST_STAGEN,0,$(target))) \
298+
$(eval $(call TEST_STAGEN,1,$(target))) \
299+
$(eval $(call TEST_STAGEN,2,$(target))) \
300+
$(eval $(call TEST_STAGEN,3,$(target))))
297301

302+
check-stage0: check-stage0-$(CFG_HOST_TRIPLE)
303+
check-stage1: check-stage1-$(CFG_HOST_TRIPLE)
304+
check-stage2: check-stage2-$(CFG_HOST_TRIPLE)
305+
check-stage3: check-stage3-$(CFG_HOST_TRIPLE)
298306

299307
######################################################################
300308
# Fast-test rules

0 commit comments

Comments
 (0)