[PVFS2-CVS] commit by robl in pvfs2-1/test/automated: testscrpt.sh

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/test/automated
In directory parlweb:/tmp/cvs-serv4080

Modified Files:
	testscrpt.sh 
Log Message:
be more kind to other pvfs2-server processes that might be running.  kill more
precisely.


Index: testscrpt.sh
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/test/automated/testscrpt.sh,v
diff -u -w -p -u -r1.4 -r1.5
--- testscrpt.sh	21 Jun 2005 22:42:22 -0000	1.4
+++ testscrpt.sh	21 Jun 2005 22:54:52 -0000	1.5
@@ -50,12 +50,16 @@ setup_pvfs2() {
 	sudo rm -rf ${PVFS2_DEST}/STORAGE-pvfs2
 	sudo INSTALL-pvfs2/sbin/pvfs2-server -p pvfs2-server.pid -f fs.conf server.conf-`hostname -s`
 	sudo INSTALL-pvfs2/sbin/pvfs2-server -p pvfs2-server.pid  fs.conf server.conf-`hostname -s`
+	sudo chmod 644 ${PVFS2_DEST}/pvfs2-server.log
+	popd
 }
 
 teardown_pvfs2() {
-	sudo killall pvfs2-server
+	if [ -f ${PVFS2_DEST}/pvfs2-server.pid ] ; then
+		sudo kill `cat ${PVFS2_DEST}/pvfs2-server.pid`
 	sleep 3
-	sudo killall -9 pvfs2-server
+		sudo kill -9 `cat ${PVFS2_DEST}/pvfs2-server.pid`
+	fi
 }
 
 buidfail() {