diff options
| author | bors <bors@rust-lang.org> | 2014-01-04 16:36:46 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-04 16:36:46 -0800 |
| commit | ea4219f6e59bb0a6cd915cf71c934079767944b0 (patch) | |
| tree | 2d7f0acdbd36c25ed8e2abc8009ebe9082eb70d5 | |
| parent | 19cff913f369343182b83f9d05c6c7418890fd40 (diff) | |
| parent | 2453079d09d992b4a234761025cdcca618793027 (diff) | |
| download | rust-ea4219f6e59bb0a6cd915cf71c934079767944b0.tar.gz rust-ea4219f6e59bb0a6cd915cf71c934079767944b0.zip | |
auto merge of #11290 : alexcrichton/rust/testname, r=brson
Closes #11288 Closes #11222
| -rw-r--r-- | mk/tests.mk | 6 | ||||
| -rw-r--r-- | src/etc/maketest.py | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mk/tests.mk b/mk/tests.mk index 882fc7e554f..4573ca3a14f 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -768,7 +768,7 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): \ $$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) @$$(call E, run doc-$(4) [$(2)]) $$(Q)$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) --test \ - $$(CRATE_DOC_LIB-$(4)) && touch $$@ + $$(CRATE_DOC_LIB-$(4)) --test-args "$$(TESTARGS)" && touch $$@ else $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): touch $$@ @@ -970,12 +970,12 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \ $$(CSREQ$(1)_T_$(2)_H_$(3)) @rm -rf $(3)/test/run-make/$$* @mkdir -p $(3)/test/run-make/$$* - @echo maketest: $$* $$(Q)$$(CFG_PYTHON) $(S)src/etc/maketest.py $$(dir $$<) \ $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \ $(3)/test/run-make/$$* \ "$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \ - $$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) + $$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \ + "$$(TESTNAME)" @touch $$@ else # FIXME #11094 - The above rule doesn't work right for multiple targets diff --git a/src/etc/maketest.py b/src/etc/maketest.py index 00d80e1bf4d..91de7fba758 100644 --- a/src/etc/maketest.py +++ b/src/etc/maketest.py @@ -8,6 +8,11 @@ os.putenv('RUSTC', os.path.abspath(sys.argv[2])) os.putenv('TMPDIR', os.path.abspath(sys.argv[3])) os.putenv('CC', sys.argv[4]) 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]], stdout = subprocess.PIPE, |