Do not run daemon when running with ONLY_TEST_TYPE=nodaemon

This commit is contained in:
ZyX 2014-08-29 22:36:32 +04:00
parent 9a0e100ca0
commit 5bd543ae89

View File

@ -232,6 +232,9 @@ if test -z "${ONLY_SHELL}" || test "x${ONLY_SHELL%sh}" != "x${ONLY_SHELL}" || te
scripts/powerline-config shell command scripts/powerline-config shell command
for TEST_TYPE in "daemon" "nodaemon" ; do for TEST_TYPE in "daemon" "nodaemon" ; do
if test "x$ONLY_TEST_TYPE" != "x" && test "x$ONLY_TEST_TYPE" != "x$TEST_TYPE" ; then
continue
fi
if test x$FAST = x1 ; then if test x$FAST = x1 ; then
if test $TEST_TYPE = daemon ; then if test $TEST_TYPE = daemon ; then
VARIANTS=3 VARIANTS=3
@ -248,9 +251,6 @@ if test -z "${ONLY_SHELL}" || test "x${ONLY_SHELL%sh}" != "x${ONLY_SHELL}" || te
$PYTHON ./scripts/powerline-daemon -s$ADDRESS -f &>tests/shell/daemon_log $PYTHON ./scripts/powerline-daemon -s$ADDRESS -f &>tests/shell/daemon_log
' & ' &
fi fi
if test "x$ONLY_TEST_TYPE" != "x" && test "x$ONLY_TEST_TYPE" != "x$TEST_TYPE" ; then
continue
fi
echo "> Testing $TEST_TYPE" echo "> Testing $TEST_TYPE"
I=-1 I=-1
for POWERLINE_COMMAND in \ for POWERLINE_COMMAND in \