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

CVS commit program cvs at parl.clemson.edu
Mon Jun 27 17:18:30 EDT 2005


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

Modified Files:
	testscrpt.sh 
Log Message:
- if we're not in the list of vfs hosts, don't build the kernel module
- force wget to overwrite mpich2-latest.tar.gz


Index: testscrpt.sh
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/test/automated/testscrpt.sh,v
diff -u -w -p -u -r1.19 -r1.20
--- testscrpt.sh	24 Jun 2005 15:55:34 -0000	1.19
+++ testscrpt.sh	27 Jun 2005 20:18:29 -0000	1.20
@@ -40,11 +40,15 @@ pull_and_build_pvfs2 () {
 	[ -n "$SKIP_BUILDING_PVFS2" ] && return 0
 
 	mkdir -p $PVFS2_DEST
+	with_kernel=""
+	if  [ $do_vfs -eq 1 ] ; then
+		with_kernel="-k /lib/modules/`uname -r`/build"
+	fi
 	# a bit of gross shell hackery, but cuts down on the number of
 	# variables we have to set.  Assumes we ran this script out of a
 	# checked out pvfs2 tree
 	$(cd `dirname $0`;pwd)/../../maint/build/pvfs2-build.sh \
-		-k /lib/modules/`uname -r`/build -r $PVFS2_DEST
+		$with_kernel -r $PVFS2_DEST
 	
 }
 
@@ -53,7 +57,8 @@ pull_and_build_mpich2 () {
 	[ -n "${SKIP_BUILDING_MPICH2}" ] && return 0
 	[ -d ${PVFS2_DEST} ] || mkdir ${PVFS2_DEST}
 	cd ${PVFS2_DEST}
-	wget --quiet 'http://www.mcs.anl.gov/~robl/mpich2/mpich2-latest.tar.gz'
+	rm -rf mpich2-latest.tar.gz
+	wget --quiet 'http://www.mcs.anl.gov/~robl/mpich2/mpich2-latest.tar.gz' -o mpich2-latest.tar.gz
 	rm -rf mpich2-snap-*
 	tar xzf mpich2-latest.tar.gz
 	cd mpich2-snap-*
@@ -169,7 +174,7 @@ ${TINDERSCRIPT} ${TESTNAME} building $ST
 
 # will we be able to do VFS-related tests?
 do_vfs=0
-for s in $(echo VFS_HOSTS); do
+for s in $(echo $VFS_HOSTS); do
 	if [ `hostname -s` = $s ] ; then
 		do_vfs=1
 		break



More information about the PVFS2-CVS mailing list