summaryrefslogtreecommitdiff
path: root/source4/script/tests
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-18 05:15:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:29:36 -0500
commita6c9065457813cf81a7d50022530ed197f730452 (patch)
tree181f8990e401a51ce83f3bda51f043c7c160a330 /source4/script/tests
parentb37e82567d28626d39ce02c392d09a815cce497f (diff)
downloadsamba-a6c9065457813cf81a7d50022530ed197f730452.tar.gz
samba-a6c9065457813cf81a7d50022530ed197f730452.tar.bz2
samba-a6c9065457813cf81a7d50022530ed197f730452.zip
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)
Diffstat (limited to 'source4/script/tests')
-rwxr-xr-xsource4/script/tests/selftest.sh2
-rw-r--r--source4/script/tests/test_functions.sh18
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