auto merge of #11290 : alexcrichton/rust/testname, r=brson
Closes #11288 Closes #11222
This commit is contained in:
commit
ea4219f6e5
|
@ -768,7 +768,7 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): \
|
||||||
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3))
|
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3))
|
||||||
@$$(call E, run doc-$(4) [$(2)])
|
@$$(call E, run doc-$(4) [$(2)])
|
||||||
$$(Q)$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) --test \
|
$$(Q)$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) --test \
|
||||||
$$(CRATE_DOC_LIB-$(4)) && touch $$@
|
$$(CRATE_DOC_LIB-$(4)) --test-args "$$(TESTARGS)" && touch $$@
|
||||||
else
|
else
|
||||||
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)):
|
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)):
|
||||||
touch $$@
|
touch $$@
|
||||||
|
@ -970,12 +970,12 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
|
||||||
$$(CSREQ$(1)_T_$(2)_H_$(3))
|
$$(CSREQ$(1)_T_$(2)_H_$(3))
|
||||||
@rm -rf $(3)/test/run-make/$$*
|
@rm -rf $(3)/test/run-make/$$*
|
||||||
@mkdir -p $(3)/test/run-make/$$*
|
@mkdir -p $(3)/test/run-make/$$*
|
||||||
@echo maketest: $$*
|
|
||||||
$$(Q)$$(CFG_PYTHON) $(S)src/etc/maketest.py $$(dir $$<) \
|
$$(Q)$$(CFG_PYTHON) $(S)src/etc/maketest.py $$(dir $$<) \
|
||||||
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
|
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
|
||||||
$(3)/test/run-make/$$* \
|
$(3)/test/run-make/$$* \
|
||||||
"$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \
|
"$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \
|
||||||
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3))
|
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
|
||||||
|
"$$(TESTNAME)"
|
||||||
@touch $$@
|
@touch $$@
|
||||||
else
|
else
|
||||||
# FIXME #11094 - The above rule doesn't work right for multiple targets
|
# FIXME #11094 - The above rule doesn't work right for multiple targets
|
||||||
|
|
|
@ -8,6 +8,11 @@ os.putenv('RUSTC', os.path.abspath(sys.argv[2]))
|
||||||
os.putenv('TMPDIR', os.path.abspath(sys.argv[3]))
|
os.putenv('TMPDIR', os.path.abspath(sys.argv[3]))
|
||||||
os.putenv('CC', sys.argv[4])
|
os.putenv('CC', sys.argv[4])
|
||||||
os.putenv('RUSTDOC', os.path.abspath(sys.argv[5]))
|
os.putenv('RUSTDOC', os.path.abspath(sys.argv[5]))
|
||||||
|
filt = sys.argv[6]
|
||||||
|
|
||||||
|
if not filt in sys.argv[1]:
|
||||||
|
sys.exit(0)
|
||||||
|
print('maketest: ' + os.path.basename(os.path.dirname(sys.argv[1])))
|
||||||
|
|
||||||
proc = subprocess.Popen(['make', '-C', sys.argv[1]],
|
proc = subprocess.Popen(['make', '-C', sys.argv[1]],
|
||||||
stdout = subprocess.PIPE,
|
stdout = subprocess.PIPE,
|
||||||
|
|
Loading…
Reference in New Issue