From 45b83c9164c2462503c2cd381a4b1b85f75fa107 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Mon, 18 Nov 2019 18:53:45 +0100 Subject: [PATCH] Fix Makefile themes check --- src/test/run-make-fulldeps/rustdoc-themes/Makefile | 1 + src/test/run-make-fulldeps/tools.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- 2.44.0