r8536: - use smbd pid file to kill at end of selftest

- remove use of 'jobs -p' as it is not portable
(This used to be commit ff42315245750a37759ef84548582da5cf5e4716)

diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index ca7ffe451f49c6fd848c78249541e84b58fb509c..b947256738089605836181e79c770ce09974630b 100755 (executable)
--- 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 366b4c1c489dcb82cb1460b027510e1fe1993494..e228fe8a9326ce223c2f8ad1ce50abfc75bb30c5 100644 (file)
--- 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