svn commit: samba r8536 - in branches/SAMBA_4_0/source/script/tests: .

[tridge at samba.org]

Author: tridge
Date: 2005-07-18 05:15:22 +0000 (Mon, 18 Jul 2005)
New Revision: 8536

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8536

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

- remove use of 'jobs -p' as it is not portable


Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.sh
   branches/SAMBA_4_0/source/script/tests/test_functions.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.sh	2005-07-18 03:35:52 UTC (rev 8535)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh	2005-07-18 05:15:22 UTC (rev 8536)
@@ -133,6 +133,8 @@
 ) 9>$SMBD_TEST_FIFO
 failed=$?
 
+kill `cat $PIDDIR/smbd.pid`
+
 END=`date`
 echo "START: $START ($0)";
 echo "END:   $END ($0)";

Modified: branches/SAMBA_4_0/source/script/tests/test_functions.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_functions.sh	2005-07-18 03:35:52 UTC (rev 8535)
+++ branches/SAMBA_4_0/source/script/tests/test_functions.sh	2005-07-18 05:15:22 UTC (rev 8536)
@@ -127,15 +127,6 @@
 	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 @@
 	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