mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

configure: we don't need mako any more.

Browse source 
And guard the mako-specific tests with a check instead.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2020-08-31 10:52:59 +09:30 • committed by neil saitug
parent 2c9ad7ea29
commit 390c6470ad
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
configure vendored
View file

@ -77,20 +77,18 @@ default_pytest()
done done
} }
require() check_command()
{ {
name="$1" name="$1"
resolution="$2" shift 1
shift 2
echo -n "checking for $name... " echo -n "checking for $name... "
if "$@" 2>/dev/null; then if "$@" 2>/dev/null; then
echo 'found' echo 'found'
return return 0
fi fi
echo 'not found' echo 'not found'
echo "$resolution" >&2 return 1
exit 1
} }
default_valgrind_setting() default_valgrind_setting()
@ -235,9 +233,6 @@ if [ "$ASAN" = "1" ]; then
fi fi
fi fi
# Doesn't set a var, but makes sure it exists
require 'python3-mako' "You need the mako module for python3: see doc/INSTALL.md" python3 -c 'import mako'
SQLITE3_CFLAGS="" SQLITE3_CFLAGS=""
SQLITE3_LDLIBS="-lsqlite3" SQLITE3_LDLIBS="-lsqlite3"
if command -v "${PKG_CONFIG}" >/dev/null; then if command -v "${PKG_CONFIG}" >/dev/null; then
@ -362,6 +357,13 @@ int main(void)
} }
/*END*/ /*END*/
EOF EOF
if check_command 'python3-mako' python3 -c 'import mako'; then
HAVE_PYTHON3_MAKO=1
else
HAVE_PYTHON3_MAKO=0
fi
mv $CONFIG_VAR_FILE.$$ $CONFIG_VAR_FILE mv $CONFIG_VAR_FILE.$$ $CONFIG_VAR_FILE
# Now we can finally set our warning flags # Now we can finally set our warning flags
@ -389,6 +391,7 @@ add_var PYTEST "$PYTEST"
add_var STATIC "$STATIC" add_var STATIC "$STATIC"
add_var ASAN "$ASAN" add_var ASAN "$ASAN"
add_var TEST_NETWORK "$TEST_NETWORK" add_var TEST_NETWORK "$TEST_NETWORK"
add_var HAVE_PYTHON3_MAKO "$HAVE_PYTHON3_MAKO"
# Hack to avoid sha256 name clash with libwally: will be fixed when that # Hack to avoid sha256 name clash with libwally: will be fixed when that
# becomes a standalone shared lib. # becomes a standalone shared lib.

4
tools/test/Makefile
View file

@ -5,6 +5,9 @@
# #
# We generate the files, and then we attempt to compile # We generate the files, and then we attempt to compile
# and run a test case. # and run a test case.
# We don't run these at all unless mako is installed.
ifeq ($(HAVE_PYTHON3_MAKO),1)
check-units: check-tools check-units: check-tools
TOOL_TEST_INCL_SRC := tools/test/enum.c TOOL_TEST_INCL_SRC := tools/test/enum.c
@ -49,6 +52,7 @@ tools/test/gen_print.c: $(TOOLS_WIRE_DEPS)
ALL_TEST_PROGRAMS += $(TOOL_TEST_PROGRAMS) ALL_TEST_PROGRAMS += $(TOOL_TEST_PROGRAMS)
check-tools: $(TOOL_TEST_PROGRAMS:%=unittest/%) check-tools: $(TOOL_TEST_PROGRAMS:%=unittest/%)
endif # HAVE_PYTHON3_MAKO
update-mocks: tools-update-mocks update-mocks: tools-update-mocks