mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-21 14:24:09 +01:00
Code Issues Projects Releases Wiki Activity

make: Set $PYTHONPATH once

Browse source 
This is used a number of times all over the place, and there is no advantage
in setting it over and over again.
This commit is contained in:
Christian Decker 2020-09-25 13:57:54 +02:00 • committed by Rusty Russell
parent 2740f2eccb
commit e13c435aca
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -71,6 +71,7 @@ endif
# Timeout shortly before the 600 second travis silence timeout # Timeout shortly before the 600 second travis silence timeout
# (method=thread to support xdist) # (method=thread to support xdist)
PYTEST_OPTS := -v --timeout=550 --timeout_method=thread -p no:logging PYTEST_OPTS := -v --timeout=550 --timeout_method=thread -p no:logging
PYTHONPATH=$(shell pwd)/contrib/pyln-client:$(shell pwd)/contrib/pyln-testing:$(shell pwd)/contrib/pyln-proto/
# This is where we add new features as bitcoin adds them. # This is where we add new features as bitcoin adds them.
FEATURES := FEATURES :=
@ -339,7 +340,7 @@ ifeq ($(PYTEST),)
exit 1 exit 1
else else
# Explicitly hand DEVELOPER and VALGRIND so you can override on make cmd line. # Explicitly hand DEVELOPER and VALGRIND so you can override on make cmd line.
PYTHONPATH=`pwd`/contrib/pyln-client:`pwd`/contrib/pyln-testing:`pwd`/contrib/pyln-proto/:$(PYTHONPATH) TEST_DEBUG=1 DEVELOPER=$(DEVELOPER) VALGRIND=$(VALGRIND) $(PYTEST) tests/ $(PYTEST_OPTS) PYTHONPATH=$(PYTHONPATH) TEST_DEBUG=1 DEVELOPER=$(DEVELOPER) VALGRIND=$(VALGRIND) $(PYTEST) tests/ $(PYTEST_OPTS)
endif endif
# Keep includes in alpha order. # Keep includes in alpha order.
@ -398,8 +399,8 @@ check-python: check-pyln-client
@# W503: line break before binary operator @# W503: line break before binary operator
@flake8 --ignore=E501,E731,W503 ${PYSRC} @flake8 --ignore=E501,E731,W503 ${PYSRC}
PYTHONPATH=$(PYTHONPATH) $(PYTEST) contrib/pyln-testing/tests/ PATH=$(PYLN_PATH) PYTHONPATH=$(PYTHONPATH) $(PYTEST) contrib/pyln-testing/tests/
PYTHONPATH=$(PYTHONPATH) $(PYTEST) contrib/pyln-proto/tests/ PATH=$(PYLN_PATH) PYTHONPATH=$(PYTHONPATH) $(PYTEST) contrib/pyln-proto/tests/
check-includes: check-includes:
@tools/check-includes.sh @tools/check-includes.sh