Skip to content

Commit fc6f3b1

Browse files
committed
build: Have 'make check' run all target/host combinations
1 parent 2979b3d commit fc6f3b1

File tree

1 file changed

+48
-16
lines changed

1 file changed

+48
-16
lines changed

mk/tests.mk

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -387,14 +387,30 @@ $(foreach host,$(CFG_TARGET_TRIPLES), \
387387

388388
define DEF_CHECK_FOR_STAGE_H
389389

390-
check-stage$(1)-H-$(2): check-stage$(1)-T-$(2)-H-$(2)
391-
check-stage$(1)-H-$(2)-perf: check-stage$(1)-T-$(2)-H-$(2)-perf
392-
check-stage$(1)-H-$(2)-rustc: check-stage$(1)-T-$(2)-H-$(2)-rustc
393-
check-stage$(1)-H-$(2)-std: check-stage$(1)-T-$(2)-H-$(2)-std
394-
check-stage$(1)-H-$(2)-rpass: check-stage$(1)-T-$(2)-H-$(2)-rpass
395-
check-stage$(1)-H-$(2)-rfail: check-stage$(1)-T-$(2)-H-$(2)-rfail
396-
check-stage$(1)-H-$(2)-cfail: check-stage$(1)-T-$(2)-H-$(2)-cfail
397-
check-stage$(1)-H-$(2)-bench: check-stage$(1)-T-$(2)-H-$(2)-bench
390+
check-stage$(1)-H-$(2): \
391+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
392+
check-stage$(1)-T-$$(target)-H-$(2))
393+
check-stage$(1)-H-$(2)-perf: \
394+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
395+
check-stage$(1)-T-$$(target)-H-$(2)-perf)
396+
check-stage$(1)-H-$(2)-rustc: \
397+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
398+
check-stage$(1)-T-$$(target)-H-$(2)-rustc)
399+
check-stage$(1)-H-$(2)-std: \
400+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
401+
check-stage$(1)-T-$$(target)-H-$(2)-std)
402+
check-stage$(1)-H-$(2)-rpass: \
403+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
404+
check-stage$(1)-T-$$(target)-H-$(2)-rpass)
405+
check-stage$(1)-H-$(2)-rfail: \
406+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
407+
check-stage$(1)-T-$$(target)-H-$(2)-rfail)
408+
check-stage$(1)-H-$(2)-cfail: \
409+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
410+
check-stage$(1)-T-$$(target)-H-$(2)-cfail)
411+
check-stage$(1)-H-$(2)-bench: \
412+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
413+
check-stage$(1)-T-$$(target)-H-$(2)-bench)
398414

399415
endef
400416

@@ -413,14 +429,30 @@ $(foreach target,$(CFG_TARGET_TRIPLES), \
413429

414430
define DEF_CHECK_FOR_STAGE
415431

416-
check-stage$(1): check-stage$(1)-H-$(CFG_HOST_TRIPLE)
417-
check-stage$(1)-perf: check-stage$(1)-H-$(CFG_HOST_TRIPLE)-perf
418-
check-stage$(1)-rustc: check-stage$(1)-H-$(CFG_HOST_TRIPLE)-rustc
419-
check-stage$(1)-std: check-stage$(1)-H-$(CFG_HOST_TRIPLE)-std
420-
check-stage$(1)-rpass: check-stage$(1)-H-$(CFG_HOST_TRIPLE)-rpass
421-
check-stage$(1)-rfail: check-stage$(1)-H-$(CFG_HOST_TRIPLE)-rfail
422-
check-stage$(1)-cfail: check-stage$(1)-H-$(CFG_HOST_TRIPLE)-cfail
423-
check-stage$(1)-bench: check-stage$(1)-H-$(CFG_HOST_TRIPLE)-bench
432+
check-stage$(1): \
433+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
434+
check-stage$(1)-H-$$(target))
435+
check-stage$(1)-perf: \
436+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
437+
check-stage$(1)-H-$$(target)-perf)
438+
check-stage$(1)-rustc: \
439+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
440+
check-stage$(1)-H-$$(target)-rustc)
441+
check-stage$(1)-std: \
442+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
443+
check-stage$(1)-H-$$(target)-std)
444+
check-stage$(1)-rpass: \
445+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
446+
check-stage$(1)-H-$$(target)-rpass)
447+
check-stage$(1)-rfail: \
448+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
449+
check-stage$(1)-H-$$(target)-rfail)
450+
check-stage$(1)-cfail: \
451+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
452+
check-stage$(1)-H-$$(target)-cfail)
453+
check-stage$(1)-bench: \
454+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
455+
check-stage$(1)-H-$$(target)-bench)
424456

425457
endef
426458

0 commit comments

Comments
 (0)