[PVFS2-CVS] commit by slang in pvfs2/test/automated/mpiio-tests.d: functions ior-mpiio mpi-io-test noncontig

[CVS commit program]

Update of /projects/cvsroot/pvfs2/test/automated/mpiio-tests.d
In directory parlweb:/tmp/cvs-serv30967/test/automated/mpiio-tests.d

Modified Files:
      Tag: slang-attr-cache-fixups-branch
	functions ior-mpiio mpi-io-test noncontig 
Log Message:
merge changes from trunk since branch point into branch.  Effectively moves the branchpoint to the latest trunk.


Index: functions
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/automated/mpiio-tests.d/functions,v
diff -p -u -r1.1 -r1.1.2.1
--- functions	12 Jul 2005 22:53:34 -0000	1.1
+++ functions	10 Aug 2005 19:38:10 -0000	1.1.2.1
@@ -14,6 +14,7 @@ make_pbs_script() {
 #PBS -l walltime=0:30:0
 #PBS -l nodes=8
 #PBS -j oe
+#PBS -q shared
 
 nprocs=4
 

Index: ior-mpiio
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/automated/mpiio-tests.d/ior-mpiio,v
diff -p -u -r1.3 -r1.3.2.1
--- ior-mpiio	12 Jul 2005 22:53:34 -0000	1.3
+++ ior-mpiio	10 Aug 2005 19:38:10 -0000	1.3.2.1
@@ -8,7 +8,7 @@
 
 IOR=${CLUSTER_DIR}/IOR
 
-(cd ${EXTRA_TESTS}/IOR-2.8.4 && make mpiio && cp src/C/IOR ${IOR} )
+(cd ${EXTRA_TESTS}/IOR-2.8.6 && make mpiio && cp src/C/IOR ${IOR} )
 
 if [ $? -eq 1 ] ; then
 	exit 1
@@ -22,10 +22,10 @@ fi
 if [ -f $PAV_CONFIG ] ; then 
 	# write out a pbs script
 	pbs_script=${CLUSTER_DIR}/ior.sh
-	make_pbs_script ${IOR} -a MPIIO -o testfs:\${MOUNTPOINT}/iortest > $pbs_script
+	make_pbs_script ${IOR} -a MPIIO -o pvfs2:\${MOUNTPOINT}/iortest > $pbs_script
 
 	# submit it
-	job_id=$(qsub -N ior -q shared $pbs_script | cut -d . -f1)
+	job_id=$(qsub -N ior $pbs_script | cut -d . -f1)
 
 	# wait patently for it to complete
 	block_until_done $job_id

Index: mpi-io-test
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/automated/mpiio-tests.d/mpi-io-test,v
diff -p -u -r1.10 -r1.10.2.1
--- mpi-io-test	12 Jul 2005 22:53:34 -0000	1.10
+++ mpi-io-test	10 Aug 2005 19:38:10 -0000	1.10.2.1
@@ -25,7 +25,7 @@ if [ -f $PAV_CONFIG ] ; then 
 	make_pbs_script ${MPI_IO_TEST} -f pvfs2:\${MOUNTPOINT}/file1 -b $((1024*1024*32)) -y > $pbs_script
 
 	# submit it
-	job_id=$(qsub -N mpiiotest -q shared $pbs_script | cut -d . -f1)
+	job_id=$(qsub -N mpiiotest $pbs_script | cut -d . -f1)
 
 	# wait patently for it to complete
 	block_until_done $job_id

Index: noncontig
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/automated/mpiio-tests.d/noncontig,v
diff -p -u -r1.3 -r1.3.2.1
--- noncontig	12 Jul 2005 22:53:34 -0000	1.3
+++ noncontig	10 Aug 2005 19:38:10 -0000	1.3.2.1
@@ -29,7 +29,7 @@ if [ -f $PAV_CONFIG ] ; then 
 		-veccount 1 -timing -all -loops 1 > $pbs_script
 
 	# submit it
-	job_id=$(qsub -N noncontig -q shared $pbs_script | cut -d . -f1)
+	job_id=$(qsub -N noncontig $pbs_script | cut -d . -f1)
 
 	if [ $? -ne 0 ] ; then
 		exit 1