@@ -115,63 +115,63 @@ define TEST_STAGEN
115
115
# $(2) is the target triple to test
116
116
# $(3) is the host triple to test
117
117
118
- check-stage$(1 ) -$(2 ) -H-$(3 ) : tidy \
119
- check-stage$(1 ) -$(2 ) -H-$(3 ) -rustc \
120
- check-stage$(1 ) -$(2 ) -H-$(3 ) -std \
121
- check-stage$(1 ) -$(2 ) -H-$(3 ) -rpass \
122
- check-stage$(1 ) -$(2 ) -H-$(3 ) -rfail \
123
- check-stage$(1 ) -$(2 ) -H-$(3 ) -cfail \
124
- check-stage$(1 ) -$(2 ) -H-$(3 ) -bench \
125
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty
118
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) : tidy \
119
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -rustc \
120
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -std \
121
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -rpass \
122
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -rfail \
123
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -cfail \
124
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -bench \
125
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty
126
126
127
- check-stage$(1 ) -$(2 ) -H-$(3 ) -std: \
128
- check-stage$(1 ) -$(2 ) -H-$(3 ) -std-dummy
127
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -std: \
128
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -std-dummy
129
129
130
- check-stage$(1 ) -$(2 ) -H-$(3 ) -rustc: \
131
- check-stage$(1 ) -$(2 ) -H-$(3 ) -rustc-dummy
130
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -rustc: \
131
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -rustc-dummy
132
132
133
- check-stage$(1 ) -$(2 ) -H-$(3 ) -cfail: \
134
- check-stage$(1 ) -$(2 ) -H-$(3 ) -cfail-dummy
133
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -cfail: \
134
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -cfail-dummy
135
135
136
- check-stage$(1 ) -$(2 ) -H-$(3 ) -rfail: \
137
- check-stage$(1 ) -$(2 ) -H-$(3 ) -rfail-dummy
136
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -rfail: \
137
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -rfail-dummy
138
138
139
- check-stage$(1 ) -$(2 ) -H-$(3 ) -rpass: \
140
- check-stage$(1 ) -$(2 ) -H-$(3 ) -rpass-dummy
139
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -rpass: \
140
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -rpass-dummy
141
141
142
- check-stage$(1 ) -$(2 ) -H-$(3 ) -bench: \
143
- check-stage$(1 ) -$(2 ) -H-$(3 ) -bench-dummy
142
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -bench: \
143
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -bench-dummy
144
144
145
- check-stage$(1 ) -$(2 ) -H-$(3 ) -perf: \
146
- check-stage$(1 ) -$(2 ) -H-$(3 ) -perf-dummy
145
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -perf: \
146
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -perf-dummy
147
147
148
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty: \
149
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-rpass \
150
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-rfail \
151
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-bench \
152
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-pretty
148
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty: \
149
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-rpass \
150
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-rfail \
151
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-bench \
152
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-pretty
153
153
154
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-rpass: \
155
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-rpass-dummy
154
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-rpass: \
155
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-rpass-dummy
156
156
157
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-rfail: \
158
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-rfail-dummy
157
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-rfail: \
158
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-rfail-dummy
159
159
160
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-bench: \
161
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-bench-dummy
160
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-bench: \
161
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-bench-dummy
162
162
163
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-pretty: \
164
- check-stage$(1 ) -$(2 ) -H-$(3 ) -pretty-pretty-dummy
163
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-pretty: \
164
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -pretty-pretty-dummy
165
165
166
166
# Rules for the standard library test runner
167
167
168
168
$(3 ) /test/stdtest.stage$(1 ) -$(2 )$$(X ) : \
169
169
$$(STDTEST_CRATE ) $$(STDTEST_INPUTS ) \
170
170
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) )
171
171
@$$(call E, compile_and_link: $$@ )
172
- $$(STAGE$(1 ) _ $(2 ) ) -o $$@ $$< --test
172
+ $$(STAGE$(1 ) _T_ $(2 ) _H_ $( 3 ) ) -o $$@ $$< --test
173
173
174
- check-stage$(1 ) -$(2 ) -H-$(3 ) -std-dummy: \
174
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -std-dummy: \
175
175
$(3 ) /test/stdtest.stage$(1 ) -$(2 )$$(X )
176
176
@$$(call E, run: $$< )
177
177
$$(Q )$$(call CFG_RUN_TEST,$$< ) $$(TESTARGS )
@@ -182,131 +182,140 @@ $(3)/test/rustctest.stage$(1)-$(2)$$(X): \
182
182
$$(COMPILER_CRATE ) \
183
183
$$(COMPILER_INPUTS ) \
184
184
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
185
- $$(TARGET_LIB $(1 ) _T_$(2 ) _H_$(3 ) ) /$$(CFG_RUSTLLVM )
185
+ $$(TLIB $(1 ) _T_$(2 ) _H_$(3 ) ) /$$(CFG_RUSTLLVM )
186
186
@$$(call E, compile_and_link: $$@ )
187
- $$(STAGE$(1 ) _ $(2 ) ) -o $$@ $$< --test
187
+ $$(STAGE$(1 ) _T_ $(2 ) _H_ $( 3 ) ) -o $$@ $$< --test
188
188
189
- check-stage$(1 ) -$(2 ) -H-$(3 ) -rustc-dummy: \
189
+ check-stage$(1 ) -T- $(2 ) -H-$(3 ) -rustc-dummy: \
190
190
$(3 ) /test/rustctest.stage$(1 ) -$(2 )$$(X )
191
191
@$$(call E, run: $$< )
192
192
$$(Q )$$(call CFG_RUN_TEST,$$< ) $$(TESTARGS )
193
193
194
194
# Rules for the cfail/rfail/rpass/bench/perf test runner
195
195
196
- CTEST_COMMON_ARGS$(1 ) -$(2 ) -$(3 ) := \
196
+ CTEST_COMMON_ARGS$(1 ) -T- $(2 ) -H- $(3 ) := \
197
197
--compile-lib-path $$(HLIB$(1 ) _H_$(3 ) ) \
198
198
--run-lib-path $$(TLIB$(1 ) _T_$(2 ) _H_$(3 ) ) \
199
199
--rustc-path $$(HBIN$(1 ) _H_$(3 ) ) /rustc$$(X ) \
200
200
--stage-id stage$(1 ) -$(2 ) \
201
201
--rustcflags "$$(CFG_RUSTC_FLAGS ) --target=$(2 ) " \
202
202
$$(CTEST_TESTARGS )
203
203
204
- CFAIL_ARGS$(1 ) -$(2 ) -$(3 ) := $$(CTEST_COMMON_ARGS$(1 ) -$(2 ) -$(3 ) ) \
205
- --src-base $$(S ) src/test/compile-fail/ \
206
- --build-base test/compile-fail/ \
204
+ CFAIL_ARGS$(1 ) -T-$(2 ) -H-$(3 ) := \
205
+ $$(CTEST_COMMON_ARGS$(1 ) -T-$(2 ) -H-$(3 ) ) \
206
+ --src-base $$(S ) src/test/compile-fail/ \
207
+ --build-base test/compile-fail/ \
207
208
--mode compile-fail
208
209
209
- RFAIL_ARGS$(1 ) -$(2 ) -$(3 ) := $$(CTEST_COMMON_ARGS$(1 ) -$(2 ) -$(3 ) ) \
210
- --src-base $$(S ) src/test/run-fail/ \
211
- --build-base test/run-fail/ \
212
- --mode run-fail \
210
+ RFAIL_ARGS$(1 ) -T-$(2 ) -H-$(3 ) := \
211
+ $$(CTEST_COMMON_ARGS$(1 ) -T-$(2 ) -H-$(3 ) ) \
212
+ --src-base $$(S ) src/test/run-fail/ \
213
+ --build-base test/run-fail/ \
214
+ --mode run-fail \
213
215
$$(CTEST_RUNTOOL )
214
216
215
- RPASS_ARGS$(1 ) -$(2 ) -$(3 ) := $$(CTEST_COMMON_ARGS$(1 ) -$(2 ) -$(3 ) ) \
216
- --src-base $$(S ) src/test/run-pass/ \
217
- --build-base test/run-pass/ \
218
- --mode run-pass \
217
+ RPASS_ARGS$(1 ) -T-$(2 ) -H-$(3 ) := \
218
+ $$(CTEST_COMMON_ARGS$(1 ) -T-$(2 ) -H-$(3 ) ) \
219
+ --src-base $$(S ) src/test/run-pass/ \
220
+ --build-base test/run-pass/ \
221
+ --mode run-pass \
219
222
$$(CTEST_RUNTOOL )
220
223
221
- BENCH_ARGS$(1 ) -$(2 ) -$(3 ) := $$(CTEST_COMMON_ARGS$(1 ) -$(2 ) -$(3 ) ) \
222
- --src-base $$(S ) src/test/bench/ \
223
- --build-base test/bench/ \
224
- --mode run-pass \
224
+ BENCH_ARGS$(1 ) -T-$(2 ) -H-$(3 ) := \
225
+ $$(CTEST_COMMON_ARGS$(1 ) -T-$(2 ) -H-$(3 ) ) \
226
+ --src-base $$(S ) src/test/bench/ \
227
+ --build-base test/bench/ \
228
+ --mode run-pass \
225
229
$$(CTEST_RUNTOOL )
226
230
227
- PERF_ARGS$(1 ) -$(2 ) -$(3 ) := $$(CTEST_COMMON_ARGS$(1 ) -$(2 ) -$(3 ) ) \
228
- --src-base $$(S ) src/test/bench/ \
229
- --build-base test/perf/ \
230
- --mode run-pass \
231
+ PERF_ARGS$(1 ) -T-$(2 ) -H-$(3 ) := \
232
+ $$(CTEST_COMMON_ARGS$(1 ) -T-$(2 ) -H-$(3 ) ) \
233
+ --src-base $$(S ) src/test/bench/ \
234
+ --build-base test/perf/ \
235
+ --mode run-pass \
231
236
$$(CTEST_PERF_RUNTOOL )
232
237
233
- PRETTY_RPASS_ARGS$(1 ) -$(2 ) -$(3 ) := $$(CTEST_COMMON_ARGS$(1 ) -$(2 ) -$(3 ) ) \
234
- --src-base $$(S ) src/test/run-pass/ \
235
- --build-base test/run-pass/ \
236
- --mode pretty
237
-
238
- PRETTY_RFAIL_ARGS$(1 ) -$(2 ) -$(3 ) := $$(CTEST_COMMON_ARGS$(1 ) -$(2 ) -$(3 ) ) \
239
- --src-base $$(S ) src/test/run-fail/ \
240
- --build-base test/run-fail/ \
241
- --mode pretty
242
-
243
- PRETTY_BENCH_ARGS$(1 ) -$(2 ) -$(3 ) := $$(CTEST_COMMON_ARGS$(1 ) -$(2 ) -$(3 ) ) \
244
- --src-base $$(S ) src/test/bench/ \
245
- --build-base test/bench/ \
246
- --mode pretty
247
-
248
- PRETTY_PRETTY_ARGS$(1 ) -$(2 ) -$(3 ) := $$(CTEST_COMMON_ARGS$(1 ) -$(2 ) -$(3 ) ) \
249
- --src-base $$(S ) src/test/pretty/ \
250
- --build-base test/pretty/ \
251
- --mode pretty
252
-
253
- check-stage$(1 ) -$(2 ) -$(3 ) -cfail-dummy: \
238
+ PRETTY_RPASS_ARGS$(1 ) -T-$(2 ) -H-$(3 ) := \
239
+ $$(CTEST_COMMON_ARGS$(1 ) -T-$(2 ) -H-$(3 ) ) \
240
+ --src-base $$(S ) src/test/run-pass/ \
241
+ --build-base test/run-pass/ \
242
+ --mode pretty
243
+
244
+ PRETTY_RFAIL_ARGS$(1 ) -T-$(2 ) -H-$(3 ) := \
245
+ $$(CTEST_COMMON_ARGS$(1 ) -T-$(2 ) -H-$(3 ) ) \
246
+ --src-base $$(S ) src/test/run-fail/ \
247
+ --build-base test/run-fail/ \
248
+ --mode pretty
249
+
250
+ PRETTY_BENCH_ARGS$(1 ) -T-$(2 ) -H-$(3 ) := \
251
+ $$(CTEST_COMMON_ARGS$(1 ) -T-$(2 ) -H-$(3 ) ) \
252
+ --src-base $$(S ) src/test/bench/ \
253
+ --build-base test/bench/ \
254
+ --mode pretty
255
+
256
+ PRETTY_PRETTY_ARGS$(1 ) -T-$(2 ) -H-$(3 ) := \
257
+ $$(CTEST_COMMON_ARGS$(1 ) -T-$(2 ) -H-$(3 ) ) \
258
+ --src-base $$(S ) src/test/pretty/ \
259
+ --build-base test/pretty/ \
260
+ --mode pretty
261
+
262
+ check-stage$(1 ) -T-$(2 ) -H-$(3 ) -cfail-dummy: \
254
263
$$(HBIN$(1 ) _H_$(3 ) ) /compiletest$$(X ) \
255
264
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
256
265
$$(CFAIL_TESTS )
257
266
@$$(call E, run: $$< )
258
267
$$(Q )$$(call CFG_RUN_CTEST,$(1 ) ,$$< ) $$(CFAIL_ARGS$(1 ) -$(2 ) )
259
268
260
- check-stage$(1 ) -$(2 ) -$(3 ) -rfail-dummy: \
269
+ check-stage$(1 ) -T- $(2 ) -H -$(3 ) -rfail-dummy: \
261
270
$$(HBIN$(1 ) _H_$(3 ) ) /compiletest$$(X ) \
262
271
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
263
272
$$(RFAIL_TESTS )
264
273
@$$(call E, run: $$< )
265
274
$$(Q )$$(call CFG_RUN_CTEST,$(1 ) ,$$< ) $$(RFAIL_ARGS$(1 ) -$(2 ) )
266
275
267
- check-stage$(1 ) -$(2 ) -$(3 ) -rpass-dummy: \
276
+ check-stage$(1 ) -T- $(2 ) -H -$(3 ) -rpass-dummy: \
268
277
$$(HBIN$(1 ) _H_$(3 ) ) /compiletest$$(X ) \
269
278
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
270
279
$$(RPASS_TESTS )
271
280
@$$(call E, run: $$< )
272
281
$$(Q )$$(call CFG_RUN_CTEST,$(1 ) ,$$< ) $$(RPASS_ARGS$(1 ) -$(2 ) )
273
282
274
- check-stage$(1 ) -$(2 ) -$(3 ) -bench-dummy: \
283
+ check-stage$(1 ) -T- $(2 ) -H -$(3 ) -bench-dummy: \
275
284
$$(HBIN$(1 ) _H_$(3 ) ) /compiletest$$(X ) \
276
285
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
277
286
$$(BENCH_TESTS )
278
287
@$$(call E, run: $$< )
279
288
$$(Q )$$(call CFG_RUN_CTEST,$(1 ) ,$$< ) $$(BENCH_ARGS$(1 ) -$(2 ) )
280
289
281
- check-stage$(1 ) -$(2 ) -$(3 ) -perf-dummy: \
290
+ check-stage$(1 ) -T- $(2 ) -H -$(3 ) -perf-dummy: \
282
291
$$(HBIN$(1 ) _H_$(3 ) ) /compiletest$$(X ) \
283
292
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
284
293
$$(BENCH_TESTS )
285
294
@$$(call E, perf: $$< )
286
295
$$(Q )$$(call CFG_RUN_CTEST,$(1 ) ,$$< ) $$(PERF_ARGS$(1 ) -$(2 ) )
287
296
288
- check-stage$(1 ) -$(2 ) -$(3 ) -pretty-rpass-dummy: \
297
+ check-stage$(1 ) -T- $(2 ) -H -$(3 ) -pretty-rpass-dummy: \
289
298
$$(HBIN$(1 ) _H_$(3 ) ) /compiletest$$(X ) \
290
299
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
291
300
$$(RPASS_TESTS )
292
301
@$$(call E, run: $$< )
293
302
$$(Q )$$(call CFG_RUN_CTEST,$(1 ) ,$$< ) $$(PRETTY_RPASS_ARGS$(1 ) -$(2 ) )
294
303
295
- check-stage$(1 ) -$(2 ) -pretty-rfail-dummy: \
304
+ check-stage$(1 ) -T- $(2 ) -H- $( 3 ) - pretty-rfail-dummy: \
296
305
$$(HBIN$(1 ) _H_$(3 ) ) /compiletest$$(X ) \
297
306
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
298
307
$$(RFAIL_TESTS )
299
308
@$$(call E, run: $$< )
300
309
$$(Q )$$(call CFG_RUN_CTEST,$(1 ) ,$$< ) $$(PRETTY_RFAIL_ARGS$(1 ) -$(2 ) )
301
310
302
- check-stage$(1 ) -$(2 ) -pretty-bench-dummy: \
311
+ check-stage$(1 ) -T- $(2 ) -H- $( 3 ) - pretty-bench-dummy: \
303
312
$$(HBIN$(1 ) _H_$(3 ) ) /compiletest$$(X ) \
304
313
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
305
314
$$(BENCH_TESTS )
306
315
@$$(call E, run: $$< )
307
316
$$(Q )$$(call CFG_RUN_CTEST,$(1 ) ,$$< ) $$(PRETTY_BENCH_ARGS$(1 ) -$(2 ) )
308
317
309
- check-stage$(1 ) -$(2 ) -pretty-pretty-dummy: \
318
+ check-stage$(1 ) -T- $(2 ) -H- $( 3 ) - pretty-pretty-dummy: \
310
319
$$(HBIN$(1 ) _H_$(3 ) ) /compiletest$$(X ) \
311
320
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
312
321
$$(PRETTY_TESTS )
@@ -317,33 +326,46 @@ endef
317
326
318
327
# Instantiate the template for stage 0, 1, 2, 3
319
328
320
- $(foreach target,$(CFG_TARGET_TRIPLES), \
321
- $(eval $(call TEST_STAGEN,0,$(target))) \
322
- $(eval $(call TEST_STAGEN,1,$(target))) \
323
- $(eval $(call TEST_STAGEN,2,$(target))) \
324
- $(eval $(call TEST_STAGEN,3,$(target))))
329
+ $(foreach host,$(CFG_TARGET_TRIPLES), \
330
+ $(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
331
+ $(eval $(foreach stage,$(STAGES), \
332
+ $(eval $(call TEST_STAGEN,$(stage),$(target),$(host))))))))
325
333
326
334
# Make convenient Shorthand Targets for use on command
327
335
# line or by other rules:
328
336
329
- define DEF_CHECK_STAGE
337
+ define DEF_CHECK_SAME
330
338
331
- check-stage$(1 ) : check-stage$(1 ) -$$( CFG_HOST_TRIPLE )
332
- check-stage$(1 ) -perf: check-stage$(1 ) -$$( CFG_HOST_TRIPLE ) -perf
333
- check-stage$(1 ) -rustc: check-stage$(1 ) -$$( CFG_HOST_TRIPLE ) -rustc
334
- check-stage$(1 ) -std: check-stage$(1 ) -$$( CFG_HOST_TRIPLE ) -std
335
- check-stage$(1 ) -rpass: check-stage$(1 ) -$$( CFG_HOST_TRIPLE ) -rpass
336
- check-stage$(1 ) -rfail: check-stage$(1 ) -$$( CFG_HOST_TRIPLE ) -rfail
337
- check-stage$(1 ) -cfail: check-stage$(1 ) -$$( CFG_HOST_TRIPLE ) -cfail
338
- check-stage$(1 ) -bench: check-stage$(1 ) -$$( CFG_HOST_TRIPLE ) -bench
339
+ check-stage$(1 ) -H- $( 2 ) : check-stage$(1 ) -T- $( 2 ) -H- $( 2 )
340
+ check-stage$(1 ) -H- $( 2 ) - perf: check-stage$(1 ) -T- $( 2 ) -H- $( 2 ) -perf
341
+ check-stage$(1 ) -H- $( 2 ) - rustc: check-stage$(1 ) -T- $( 2 ) -H- $( 2 ) -rustc
342
+ check-stage$(1 ) -H- $( 2 ) - std: check-stage$(1 ) -T- $( 2 ) -H- $( 2 ) -std
343
+ check-stage$(1 ) -H- $( 2 ) - rpass: check-stage$(1 ) -T- $( 2 ) -H- $( 2 ) -rpass
344
+ check-stage$(1 ) -H- $( 2 ) - rfail: check-stage$(1 ) -T- $( 2 ) -H- $( 2 ) -rfail
345
+ check-stage$(1 ) -H- $( 2 ) - cfail: check-stage$(1 ) -T- $( 2 ) -H- $( 2 ) -cfail
346
+ check-stage$(1 ) -H- $( 2 ) - bench: check-stage$(1 ) -T- $( 2 ) -H- $( 2 ) -bench
339
347
340
348
endef
341
349
342
- $(eval $(call DEF_CHECK_STAGE,0))
343
- $(eval $(call DEF_CHECK_STAGE,1))
344
- $(eval $(call DEF_CHECK_STAGE,2))
345
- $(eval $(call DEF_CHECK_STAGE,3))
350
+ $(foreach stage,$(STAGES), \
351
+ $(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
352
+ $(eval $(call DEF_CHECK_SAME,$(stage),$(target))))))
353
+
354
+ define DEF_CHECK_HOST
355
+
356
+ check-stage$(1 ) : check-stage$(1 ) -H-$(CFG_HOST_TRIPLE )
357
+ check-stage$(1 ) -perf: check-stage$(1 ) -H-$(CFG_HOST_TRIPLE ) -perf
358
+ check-stage$(1 ) -rustc: check-stage$(1 ) -H-$(CFG_HOST_TRIPLE ) -rustc
359
+ check-stage$(1 ) -std: check-stage$(1 ) -H-$(CFG_HOST_TRIPLE ) -std
360
+ check-stage$(1 ) -rpass: check-stage$(1 ) -H-$(CFG_HOST_TRIPLE ) -rpass
361
+ check-stage$(1 ) -rfail: check-stage$(1 ) -H-$(CFG_HOST_TRIPLE ) -rfail
362
+ check-stage$(1 ) -cfail: check-stage$(1 ) -H-$(CFG_HOST_TRIPLE ) -cfail
363
+ check-stage$(1 ) -bench: check-stage$(1 ) -H-$(CFG_HOST_TRIPLE ) -bench
364
+
365
+ endef
346
366
367
+ $(foreach stage,$(STAGES), \
368
+ $(eval $(call DEF_CHECK_HOST,$(stage))))
347
369
348
370
# #####################################################################
349
371
# Fast-test rules
0 commit comments