status-im/miniupnp
2
0
Fork 0
mirror of https://github.com/status-im/miniupnp.git synced 2025-01-27 22:54:54 +00:00
Code Issues Projects Releases Wiki Activity

miniupnpd: configure, Makefile: make tests optional

Browse Source 
Tests confuse compilation-database-driven code analysis tools
(specifically, some tests stub out certain functions and the stubs
sometimes get preferred over real definitions). So, make them optional.
This commit is contained in:
Ivan Shapovalov 2024-09-03 16:26:32 +02:00 committed by Thomas Bernard
parent 0ab27a2a32
commit eb3cf72900
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
miniupnpd/Makefile.linux
View File

@ -75,10 +75,14 @@ NETFILTER_SCRIPTS = $(addprefix $(SRCDIR)/netfilter/, \
#LDLIBS += -lnfnetlink #LDLIBS += -lnfnetlink
EXECUTABLES = miniupnpd testupnpdescgen testgetifstats \ EXECUTABLES = miniupnpd miniupnpdctl
testupnppermissions miniupnpdctl testgetifaddr \
testgetroute testasyncsendto testportinuse \ ifeq ($(TESTS), 1)
testssdppktgen testminissdp EXECUTABLES += testupnpdescgen testgetifstats \
testupnppermissions testgetifaddr \
testgetroute testasyncsendto testportinuse \
testssdppktgen testminissdp
endif
.PHONY: all clean install dox .PHONY: all clean install dox

13
miniupnpd/Makefile.linux_nft
View File

@ -68,11 +68,14 @@ NFT_SCRIPTS = $(addprefix $(SRCDIR)/netfilter_nft/scripts/, \
#LDLIBS += -lnfnetlink #LDLIBS += -lnfnetlink
EXECUTABLES = miniupnpd miniupnpdctl \ EXECUTABLES = miniupnpd miniupnpdctl
testupnpdescgen testgetifstats \
testupnppermissions testgetifaddr \ ifeq ($(TESTS), 1)
testgetroute testasyncsendto testportinuse \ EXECUTABLES += testupnpdescgen testgetifstats \
testssdppktgen testminissdp testupnppermissions testgetifaddr \
testgetroute testasyncsendto testportinuse \
testssdppktgen testminissdp
endif
.PHONY: all clean install dox .PHONY: all clean install dox

5
miniupnpd/configure vendored
View File

@ -30,8 +30,11 @@ if [ -z "$HTTPS_KEYFILE" ] ; then
HTTPS_KEYFILE=/etc/miniupnpd/private-key.pem HTTPS_KEYFILE=/etc/miniupnpd/private-key.pem
fi fi
TESTS=1
for argv; do for argv; do
case "$argv" in case "$argv" in
--disable-tests) TESTS=0 ;;
--ipv6) IPV6=1 ;; --ipv6) IPV6=1 ;;
--igd2) IGD2=1 ;; --igd2) IGD2=1 ;;
--strict) STRICT=1 ;; --strict) STRICT=1 ;;
@ -96,6 +99,7 @@ case "$argv" in
echo " --host-os=<name> For cross build. result of uname -s on the host machine" echo " --host-os=<name> For cross build. result of uname -s on the host machine"
echo " --host-os-version=x.x For cross build. result of uname -r on the host machine" echo " --host-os-version=x.x For cross build. result of uname -r on the host machine"
echo " --host-machine=<arch> For cross build. result of uname -m on the host machine" echo " --host-machine=<arch> For cross build. result of uname -m on the host machine"
echo " --disable-tests Do not build tests"
exit 1 exit 1
;; ;;
*) *)
@ -592,6 +596,7 @@ if [ "$FW" = "iptables" ] || [ "$FW" = "nftables" ] ; then
echo "# generated by $0 on `date`" > ${CONFIG_MK} echo "# generated by $0 on `date`" > ${CONFIG_MK}
echo "SRCDIR = ${BASEDIR}" >> ${CONFIG_MK} echo "SRCDIR = ${BASEDIR}" >> ${CONFIG_MK}
echo "CPPFLAGS += -I." >> ${CONFIG_MK} echo "CPPFLAGS += -I." >> ${CONFIG_MK}
echo "TESTS = ${TESTS}" >> ${CONFIG_MK}
if [ "$PKG_CONFIG" ] ; then if [ "$PKG_CONFIG" ] ; then
if pkg_detect libcap-ng; then if pkg_detect libcap-ng; then