diff --git a/sh/runtests.sh b/sh/runtests.sh index d0d6a17d..110266b3 100755 --- a/sh/runtests.sh +++ b/sh/runtests.sh @@ -9,17 +9,17 @@ tret=0 ebegin "Testing yesno()" for f in yes YES Yes true TRUE True 1 ; do if ! yesno ${f} ; then - ((tret+=1)) + tret=$((${tret} + 1)) echo "!${f}!" fi done for f in no NO No false FALSE False 0 ; do if yesno ${f} ; then - ((tret+=1)) + tret=$(({$tret} + 1)) echo "!${f}!" fi done eend ${tret} -((ret+=tret)) +ret=$((${ret} + ${tret})) exit ${ret} diff --git a/test/setup_env.sh b/test/setup_env.sh index 96fdf9d2..6af865b2 100755 --- a/test/setup_env.sh +++ b/test/setup_env.sh @@ -12,7 +12,9 @@ builddir=${builddir:-${srcdir}} export LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBRARY_PATH} export PATH=${top_builddir}/src/rc:${PATH} -${MAKE:-make} -s -C ${top_srcdir}/src/rc links +cd ${top_srcdir}/src/rc +${MAKE:-make} links >/dev/null +cd - . ${top_srcdir}/sh/functions.sh