about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2019-11-18 18:53:45 +0100
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2019-11-18 18:53:45 +0100
commit45b83c9164c2462503c2cd381a4b1b85f75fa107 (patch)
tree7676547a2baf3cdb5405ba29426a8a5c28043499
parenta9e8d4c0c523ff4da185084790fa39cdc7ece1f3 (diff)
downloadrust-45b83c9164c2462503c2cd381a4b1b85f75fa107.tar.gz
rust-45b83c9164c2462503c2cd381a4b1b85f75fa107.zip
Fix Makefile themes check
-rw-r--r--src/test/run-make-fulldeps/rustdoc-themes/Makefile1
-rw-r--r--src/test/run-make-fulldeps/tools.mk2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/test/run-make-fulldeps/rustdoc-themes/Makefile b/src/test/run-make-fulldeps/rustdoc-themes/Makefile
index 4d80c5f3fc4..f5a471e66e5 100644
--- a/src/test/run-make-fulldeps/rustdoc-themes/Makefile
+++ b/src/test/run-make-fulldeps/rustdoc-themes/Makefile
@@ -7,3 +7,4 @@ OUTPUT_DIR := "$(TMPDIR)/rustdoc-themes"
 all:
 	cp $(S)/src/librustdoc/html/static/themes/light.css $(TMPDIR)/test.css
 	$(RUSTDOC) -o $(OUTPUT_DIR) foo.rs --theme $(TMPDIR)/test.css
+	$(HTMLDOCCK) $(OUTPUT_DIR) foo.rs
diff --git a/src/test/run-make-fulldeps/tools.mk b/src/test/run-make-fulldeps/tools.mk
index 20a5e8e6422..48fd3ff7246 100644
--- a/src/test/run-make-fulldeps/tools.mk
+++ b/src/test/run-make-fulldeps/tools.mk
@@ -15,7 +15,7 @@ RUSTC := $(RUSTC) -Clinker=$(RUSTC_LINKER)
 RUSTDOC := $(RUSTDOC) -Clinker=$(RUSTC_LINKER)
 endif
 #CC := $(CC) -L $(TMPDIR)
-HTMLDOCCK := $(PYTHON) $(S)/src/etc/htmldocck.py
+HTMLDOCCK := '$(PYTHON)' '$(S)/src/etc/htmldocck.py'
 CGREP := "$(S)/src/etc/cat-and-grep.sh"
 
 # This is the name of the binary we will generate and run; use this