diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2018-11-08 11:21:39 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-11-29 08:22:10 +0000 |
| commit | b8c72a4a8d8bd330ab62dc0c9461cac2b137575b (patch) | |
| tree | b2470923ad4e3612282115ef11ec77e1e1b70f3c /test/doc | |
| parent | 040950a59d53e8802ad31430d67df105939cce4c (diff) | |
make test: create virtualenv under /test/
instead of using build-root, use /test/venv directory for virtualenv
similarly, don't pollute build-root with test-built binaries
Change-Id: I1e63c04037eaee718b27b34ef16c9eb0252afa53
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'test/doc')
| -rw-r--r-- | test/doc/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/doc/Makefile b/test/doc/Makefile index ff96b5fd80e..be070e15346 100644 --- a/test/doc/Makefile +++ b/test/doc/Makefile @@ -3,10 +3,10 @@ # You can set these variables from the command line. SPHINXOPTS = -SRC_DOC_DIR = $(WS_ROOT)/test/doc +SRC_DOC_DIR = $(TEST_DIR)/doc SPHINXBUILD = sphinx-build PAPER = -BUILD_DOC_ROOT = $(BR)/test-doc +BUILD_DOC_ROOT = $(TEST_DIR)/doc BUILD_DOC_DIR = $(BUILD_DOC_ROOT)/build API_DOC_GEN_DIR = $(BUILD_DOC_ROOT)/apidoc @@ -16,7 +16,7 @@ PAPEROPT_letter = -D latex_paper_size=letter ALLSPHINXOPTS = -d $(BUILD_DOC_DIR)/.sphinx-cache $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(API_DOC_GEN_DIR) -c $(SRC_DOC_DIR) # the i18n builder cannot share the environment and doctrees with the others I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -IN_VENV:=$(shell if pip -V | grep "virtualenv" 2>&1 > /dev/null; then echo 1; else echo 0; fi) +IN_VENV:=$(shell if pip -V | grep "venv" 2>&1 > /dev/null; then echo 1; else echo 0; fi) .PHONY: verify-virtualenv verify-virtualenv: |