@@ -312,28 +312,26 @@ define TEST_RUNNER
312
312
# If NO_REBUILD is set then break the dependencies on extra so we can
313
313
# test crates without rebuilding std and extra first
314
314
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 ) )
316
317
else
317
318
STDTESTDEP_$(1)_$(2)_$(3) =
318
319
endif
319
320
320
321
$(3 ) /stage$(1 ) /test/stdtest-$(2 )$$(X_$(2 ) ) : \
321
322
$$(STDLIB_CRATE ) $$(STDLIB_INPUTS ) \
322
- $$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
323
323
$$(STDTESTDEP_$(1 ) _$(2 ) _$(3 ) )
324
324
@$$(call E, compile_and_link: $$@ )
325
325
$$(STAGE$(1 ) _T_$(2 ) _H_$(3 ) ) -o $$@ $$< --test
326
326
327
327
$(3 ) /stage$(1 ) /test/extratest-$(2 )$$(X_$(2 ) ) : \
328
328
$$(EXTRALIB_CRATE ) $$(EXTRALIB_INPUTS ) \
329
- $$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
330
329
$$(STDTESTDEP_$(1 ) _$(2 ) _$(3 ) )
331
330
@$$(call E, compile_and_link: $$@ )
332
331
$$(STAGE$(1 ) _T_$(2 ) _H_$(3 ) ) -o $$@ $$< --test
333
332
334
333
$(3 ) /stage$(1 ) /test/syntaxtest-$(2 )$$(X_$(2 ) ) : \
335
334
$$(LIBSYNTAX_CRATE ) $$(LIBSYNTAX_INPUTS ) \
336
- $$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) ) \
337
335
$$(STDTESTDEP_$(1 ) _$(2 ) _$(3 ) )
338
336
@$$(call E, compile_and_link: $$@ )
339
337
$$(STAGE$(1 ) _T_$(2 ) _H_$(3 ) ) -o $$@ $$< --test
0 commit comments