about summary refs log tree commit diff
path: root/mk
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-01-20 06:45:02 +0000
committerbors <bors@rust-lang.org>2015-01-20 06:45:02 +0000
commit3bf41dafcfb6c979efb4e2438e047e1a54045eec (patch)
tree46883a9bec57ec670561487b7a17c1e6fa655a3b /mk
parent9006c3c0f14be45da8ffeba43d354d088e366c83 (diff)
parent2c1d1fbdf96b4eb90fa48a3602cf869acf054d6c (diff)
Auto merge of #21304 - lifthrasiir:htmldocck, r=alexcrichton
The script is intended as a tool for doing every sort of verifications amenable to Rustdoc's HTML output. For example, link checkers would go to this script. It already parses HTML into a document tree form (with a slight caveat), so future tests can make use of it.

As an example, relevant `rustdoc-*` run-make tests have been updated to use `htmldocck.py` and got their `verify.sh` removed. In the future they may go to a dedicated directory with htmldocck running by default. The detailed explanation of test scripts is provided as a docstring of htmldocck.

cc #19723
Diffstat (limited to 'mk')
-rw-r--r--mk/tests.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/tests.mk b/mk/tests.mk
index c8c4beb1153..10452d91275 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -1011,7 +1011,8 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
 	    $$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
 	    "$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
 	    "$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
-	    $(1)
+	    $(1) \
+	    $$(S)
 	@touch $$@
 else
 # FIXME #11094 - The above rule doesn't work right for multiple targets