Skip to content

Commit c124f21

Browse files
committed
auto merge of #8110 : brson/rust/no-rebuild, r=bblum
...oses #8101
2 parents d75ab4a + 8ae900f commit c124f21

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

mk/tests.mk

+2-4
Original file line numberDiff line numberDiff line change
@@ -312,28 +312,26 @@ define TEST_RUNNER
312312
# If NO_REBUILD is set then break the dependencies on extra so we can
313313
# test crates without rebuilding std and extra first
314314
ifeq ($(NO_REBUILD),)
315-
STDTESTDEP_$(1)_$(2)_$(3) = $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_EXTRALIB_$(2))
315+
STDTESTDEP_$(1)_$(2)_$(3) = $$(SREQ$(1)_T_$(2)_H_$(3)) \
316+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_EXTRALIB_$(2))
316317
else
317318
STDTESTDEP_$(1)_$(2)_$(3) =
318319
endif
319320

320321
$(3)/stage$(1)/test/stdtest-$(2)$$(X_$(2)): \
321322
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
322-
$$(SREQ$(1)_T_$(2)_H_$(3)) \
323323
$$(STDTESTDEP_$(1)_$(2)_$(3))
324324
@$$(call E, compile_and_link: $$@)
325325
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
326326

327327
$(3)/stage$(1)/test/extratest-$(2)$$(X_$(2)): \
328328
$$(EXTRALIB_CRATE) $$(EXTRALIB_INPUTS) \
329-
$$(SREQ$(1)_T_$(2)_H_$(3)) \
330329
$$(STDTESTDEP_$(1)_$(2)_$(3))
331330
@$$(call E, compile_and_link: $$@)
332331
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
333332

334333
$(3)/stage$(1)/test/syntaxtest-$(2)$$(X_$(2)): \
335334
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
336-
$$(SREQ$(1)_T_$(2)_H_$(3)) \
337335
$$(STDTESTDEP_$(1)_$(2)_$(3))
338336
@$$(call E, compile_and_link: $$@)
339337
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test

0 commit comments

Comments
 (0)