Skip to content

Commit fc57182

Browse files
committed
auto merge of #8202 : pnkfelix/rust/fsk-issue8056-make-crates-must-dep-on-subcrates, r=graydon
Reorder TEST_HOST_CRATES in hopes of exposing future instances of this bug. Fix #8056
2 parents 986df44 + 3e5b058 commit fc57182

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

mk/tests.mk

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# The names of crates that must be tested
1717
TEST_TARGET_CRATES = std extra
18-
TEST_HOST_CRATES = syntax rustc rustdoc rust rustpkg rusti
18+
TEST_HOST_CRATES = rust rusti rustpkg rustc rustdoc syntax
1919
TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES)
2020

2121
# Markdown files under doc/ that should have their code extracted and run
@@ -347,27 +347,33 @@ $(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): \
347347
$(3)/stage$(1)/test/rustpkgtest-$(2)$$(X_$(2)): \
348348
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
349349
$$(SREQ$(1)_T_$(2)_H_$(3)) \
350+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2)) \
350351
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
351352
@$$(call E, compile_and_link: $$@)
352353
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
353354

354355
$(3)/stage$(1)/test/rustitest-$(2)$$(X_$(2)): \
355356
$$(RUSTI_LIB) $$(RUSTI_INPUTS) \
356357
$$(SREQ$(1)_T_$(2)_H_$(3)) \
358+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2)) \
357359
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
358360
@$$(call E, compile_and_link: $$@)
359361
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
360362

361363
$(3)/stage$(1)/test/rusttest-$(2)$$(X_$(2)): \
362364
$$(RUST_LIB) $$(RUST_INPUTS) \
363365
$$(SREQ$(1)_T_$(2)_H_$(3)) \
366+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTPKG_$(2)) \
367+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTDOC_$(2)) \
368+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI_$(2)) \
364369
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
365370
@$$(call E, compile_and_link: $$@)
366371
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
367372

368373
$(3)/stage$(1)/test/rustdoctest-$(2)$$(X_$(2)): \
369374
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
370375
$$(SREQ$(1)_T_$(2)_H_$(3)) \
376+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2)) \
371377
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
372378
@$$(call E, compile_and_link: $$@)
373379
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test

0 commit comments

Comments
 (0)