diff options
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/script/tests/selftest.sh | 2 | ||||
| -rw-r--r-- | source4/script/tests/test_functions.sh | 18 |
2 files changed, 2 insertions, 18 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index ca7ffe451f..b947256738 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -133,6 +133,8 @@ START=`date` ) 9>$SMBD_TEST_FIFO failed=$? +kill `cat $PIDDIR/smbd.pid` + END=`date` echo "START: $START ($0)"; echo "END: $END ($0)"; diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh index 366b4c1c48..e228fe8a93 100644 --- a/source4/script/tests/test_functions.sh +++ b/source4/script/tests/test_functions.sh @@ -127,15 +127,6 @@ testok() { name=`basename $1` failed=$2 - JOBS=`jobs -p` - for J in $JOBS;do - kill $J >/dev/null 2>&1; - done - JOBS=`jobs -p` - for J in $JOBS;do - kill -s 9 $J >/dev/null 2>&1; - done - if [ x"$failed" = x"0" ];then : else @@ -148,15 +139,6 @@ teststatus() { name=`basename $1` failed=$2 - JOBS=`jobs -p` - for J in $JOBS;do - kill $J >/dev/null 2>&1; - done - JOBS=`jobs -p` - for J in $JOBS;do - kill -s 9 $J >/dev/null 2>&1; - done - if [ x"$failed" = x"0" ];then echo "TEST STATUS: $failed"; else |