combine test directories

This fixes #295.
This commit is contained in:
William Hubbs 2019-02-22 15:19:33 -06:00
parent 6e6902c28b
commit 52d4e56674
8 changed files with 5 additions and 7 deletions

View File

@ -33,8 +33,9 @@ ifeq (${MKZSHCOMP},yes)
SUBDIR+= zsh-completion SUBDIR+= zsh-completion
endif endif
# We need to ensure that runlevels is done last # We need to ensure that runlevels is done last other than test
SUBDIR+= runlevels SUBDIR+= runlevels
SUBDIR+= test
INSTALLAFTER= _installafter INSTALLAFTER= _installafter

View File

@ -53,7 +53,6 @@ realinstall: ${BIN} ${CONF} ${INC}
install: all realinstall ${INSTALLAFTER} install: all realinstall ${INSTALLAFTER}
check test:: check test::
@if test -e runtests.sh ; then ./runtests.sh || exit $$? ; fi
# A lot of scripts don't have anything to clean # A lot of scripts don't have anything to clean
# Also, some rm implentation require a file argument regardless of error # Also, some rm implentation require a file argument regardless of error

View File

@ -31,4 +31,3 @@ _installafter:
ln -snf ${LIBEXECDIR}/sh/functions.sh ${DESTDIR}/${INITDIR} || exit $$? ln -snf ${LIBEXECDIR}/sh/functions.sh ${DESTDIR}/${INITDIR} || exit $$?
check test:: check test::
./runtests.sh

View File

@ -1,7 +1,7 @@
# Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
# Released under the 2-clause BSD license. # Released under the 2-clause BSD license.
SUBDIR= test libeinfo librc rc SUBDIR= libeinfo librc rc
MK= ../mk MK= ../mk
include ${MK}/subdir.mk include ${MK}/subdir.mk

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
top_srcdir=${top_srcdir:-../..} top_srcdir=${top_srcdir:-..}
. ${top_srcdir}/test/setup_env.sh . ${top_srcdir}/test/setup_env.sh
libeinfo_srcdir="${srcdir}/../libeinfo" libeinfo_srcdir="${srcdir}/../libeinfo"

View File

@ -15,7 +15,6 @@
ret=0 ret=0
tret=0 tret=0
ebegin "Testing yesno()"
for f in yes YES Yes true TRUE True 1 ; do for f in yes YES Yes true TRUE True 1 ; do
if ! yesno $f; then if ! yesno $f; then
: $(( tret += 1 )) : $(( tret += 1 ))
@ -28,7 +27,7 @@ for f in no NO No false FALSE False 0 ; do
echo "!$f!" echo "!$f!"
fi fi
done done
eend $tret
: $(( ret += $tret )) : $(( ret += $tret ))
eend $ret
exit $ret exit $ret