From: Augustin Degomme Date: Fri, 26 Oct 2012 15:47:29 +0000 (+0200) Subject: modify .std files to comply, as fortran ones were outputing weird things X-Git-Tag: v3_9_rc1~91^2~197 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c8bd549db50983ca2385309cb4fb92b25d5c2d54 modify .std files to comply, as fortran ones were outputing weird things --- diff --git a/teshsuite/smpi/mpich-test/CMakeLists.txt b/teshsuite/smpi/mpich-test/CMakeLists.txt index a58e2bccf9..783a2b1a6c 100644 --- a/teshsuite/smpi/mpich-test/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/CMakeLists.txt @@ -50,6 +50,7 @@ set(stdo_std_smpi ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/env/env.std ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/profile/ptest.std ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/coll/allredmany.std + ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/coll/allred.std ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/coll/allredf.std ${CMAKE_CURRENT_SOURCE_DIR}/mpich-test/coll/scatterv.std ) diff --git a/teshsuite/smpi/mpich-test/coll/allred.std b/teshsuite/smpi/mpich-test/coll/allred.std new file mode 100644 index 0000000000..06d9e1259f --- /dev/null +++ b/teshsuite/smpi/mpich-test/coll/allred.std @@ -0,0 +1,13 @@ +Testing MPI_SUM... +Testing MPI_PROD... +Testing MPI_MAX... +Testing MPI_MIN... +Testing MPI_LOR... +Testing MPI_LXOR... +Testing MPI_LAND... +Testing MPI_BOR... +Testing MPI_BAND... +Testing MPI_BXOR... +Testing MPI_MAXLOC... +Testing MPI_MINLOC... + No Errors diff --git a/teshsuite/smpi/mpich-test/coll/allredf.std b/teshsuite/smpi/mpich-test/coll/allredf.std index 13480c697d..36bd81c2c3 100644 --- a/teshsuite/smpi/mpich-test/coll/allredf.std +++ b/teshsuite/smpi/mpich-test/coll/allredf.std @@ -10,4 +10,3 @@ MPI_BXOR MPI_MAXLOC MPI_MINLOC -*** Testing allreduce from Fortran *** diff --git a/teshsuite/smpi/mpich-test/profile/runtests b/teshsuite/smpi/mpich-test/profile/runtests index 21dbc8a7be..57e8f59903 100755 --- a/teshsuite/smpi/mpich-test/profile/runtests +++ b/teshsuite/smpi/mpich-test/profile/runtests @@ -10,7 +10,7 @@ top_srcdir=/home/degomme/Downloads/mpich-test srcdir=/home/degomme/Downloads/mpich-test/profile MPICH_VERSION= STOPFILE=${MPITEST_STOPTEST:-"$HOME/.stopmpichtests"} -mpirun="smpirun -hostfile /home/degomme/Documents/hostfile_griffon -platform /home/degomme/Documents/griffon.xml --log=root.thres:critical" + MAKE="make --no-print-directory" MPIRUNMVBACK="" # @@ -19,20 +19,30 @@ MPIRUNMVBACK="" # # Set mpirun to the name/path of the mpirun program #FindMPIRUN -if [ -z "$mpirun" ] ; then - echo "No mpirun in path. Testing cannot proceed." - exit 1 -fi +#if [ -z "$mpirun" ] ; then +# echo "No mpirun in path. Testing cannot proceed." +# exit 1 +#fi # # If the programs are not available, run make. runtests=1 makeeach=0 writesummaryfile=no quiet=0 +have_fortran=0 check_at_once=1 MAKE="make --no-print-directory" for arg in "$@" ; do case $arg in + -basedir=* ) + basedir=`echo $arg | sed 's/-basedir=//'` + ;; + -srcdir=* ) + srcdir=`echo $arg | sed 's/-srcdir=//'` + ;; + -fort=* ) + have_fortran=`echo $arg | sed 's/-fort=//'` + ;; -checkonly) runtests=0 ;; @@ -75,7 +85,7 @@ for arg in "$@" ; do ;; esac done - +mpirun=" ${basedir}/bin/smpirun -platform ${srcdir}/../../../../examples/msg/small_platform_with_routers.xml -hostfile ${srcdir}/../../hostfile --log=root.thres:critical" # If the programs are not available, run make. if [ ! -x sendrecv -a $makeeach = 0 -a $runtests = 1 ] ; then $MAKE default diff --git a/teshsuite/smpi/mpich-test/pt2pt/nblock.std b/teshsuite/smpi/mpich-test/pt2pt/nblock.std index 2301776d39..7af1fd7f34 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/nblock.std +++ b/teshsuite/smpi/mpich-test/pt2pt/nblock.std @@ -1,4 +1,3 @@ -*** Testing Isend/Irecv (large numbers) *** All processes completed for count = 64 ints of data All processes completed for count = 128 ints of data All processes completed for count = 256 ints of data @@ -7,4 +6,3 @@ All processes completed for count = 1024 ints of data All processes completed for count = 2048 ints of data All processes completed for count = 4096 ints of data All processes completed for count = 8192 ints of data -*** Testing Isend/Irecv (large numbers) *** diff --git a/teshsuite/smpi/mpich-test/pt2pt/nullproc.std b/teshsuite/smpi/mpich-test/pt2pt/nullproc.std index 02779e272d..a9124d5f50 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/nullproc.std +++ b/teshsuite/smpi/mpich-test/pt2pt/nullproc.std @@ -1,3 +1 @@ -*** Testing handling of MPI_PROC_NULL *** No errors in handling MPI_PROC_NULL -*** Testing handling of MPI_PROC_NULL *** diff --git a/teshsuite/smpi/mpich-test/pt2pt/nullproc2.std b/teshsuite/smpi/mpich-test/pt2pt/nullproc2.std index 81711eff0e..a9124d5f50 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/nullproc2.std +++ b/teshsuite/smpi/mpich-test/pt2pt/nullproc2.std @@ -1,3 +1 @@ -*** Testing handling of MPI_PROC_NULL in blocking Recv *** No errors in handling MPI_PROC_NULL -*** Testing handling of MPI_PROC_NULL in blocking Recv *** diff --git a/teshsuite/smpi/mpich-test/pt2pt/persist.c b/teshsuite/smpi/mpich-test/pt2pt/persist.c index 7ed605ea02..7e1776286a 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/persist.c +++ b/teshsuite/smpi/mpich-test/pt2pt/persist.c @@ -48,7 +48,7 @@ int main( int argc, char **argv ) MPI_Request_free( &r[i] ); } - if (rank == 0) printf( "No errors\n" ); + if (rank == 0) printf( " No Errors\n" ); MPI_Finalize(); return 0; } diff --git a/teshsuite/smpi/mpich-test/pt2pt/persistent.std b/teshsuite/smpi/mpich-test/pt2pt/persistent.std index 9ef9470696..5a25fc084d 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/persistent.std +++ b/teshsuite/smpi/mpich-test/pt2pt/persistent.std @@ -1,4 +1,3 @@ -*** Testing MPI_Recv_init *** Receiving message 1 Received message 1 Receiving message 2 @@ -6,4 +5,3 @@ Received message 2 Receiving message 3 Received message 3 Completed all receives -*** Testing MPI_Recv_init *** diff --git a/teshsuite/smpi/mpich-test/pt2pt/self.std b/teshsuite/smpi/mpich-test/pt2pt/self.std index eff05ec011..2abdf2f201 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/self.std +++ b/teshsuite/smpi/mpich-test/pt2pt/self.std @@ -1,4 +1,3 @@ -*** Testing send to self *** [0] Starting waitall [0] Ending waitall [0] Starting waitall (16) @@ -29,4 +28,3 @@ [0] Ending waitall [0] Starting waitall (131072) [0] Ending waitall -*** Testing send to self *** diff --git a/teshsuite/smpi/mpich-test/pt2pt/sendmany.std b/teshsuite/smpi/mpich-test/pt2pt/sendmany.std index 6182b3c7ce..87eabe0d08 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/sendmany.std +++ b/teshsuite/smpi/mpich-test/pt2pt/sendmany.std @@ -1,4 +1,3 @@ -*** Testing Send (many procs) *** You requested to use 8 processes, but there is only 5 processes in your hostfile... length = 1 ints length = 2 ints @@ -14,4 +13,3 @@ length = 1024 ints length = 2048 ints length = 4096 ints length = 8192 ints -*** Testing Send (many procs) *** diff --git a/teshsuite/smpi/mpich-test/pt2pt/sndrcvrep.std b/teshsuite/smpi/mpich-test/pt2pt/sndrcvrep.std index 72502518b4..b001334b18 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/sndrcvrep.std +++ b/teshsuite/smpi/mpich-test/pt2pt/sndrcvrep.std @@ -1,3 +1 @@ -**** Testing MPI_Sendrecv_replace **** Completed test of MPI_Sendrecv_replace -**** Testing MPI_Sendrecv_replace **** diff --git a/teshsuite/smpi/mpich-test/pt2pt/typebase.std b/teshsuite/smpi/mpich-test/pt2pt/typebase.std index 4c24a58958..409e123108 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/typebase.std +++ b/teshsuite/smpi/mpich-test/pt2pt/typebase.std @@ -1,3 +1 @@ -**** Checking the type (sizes) routines **** Found no errors in basic C types -**** Checking the type (sizes) routines **** diff --git a/teshsuite/smpi/mpich-test/pt2pt/typecreate.std b/teshsuite/smpi/mpich-test/pt2pt/typecreate.std index 4ed4e67882..2e09a88aba 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/typecreate.std +++ b/teshsuite/smpi/mpich-test/pt2pt/typecreate.std @@ -1,3 +1 @@ -**** Checking the type creation routines **** Completed test of 2048 type creations -**** Checking the type creation routines **** diff --git a/teshsuite/smpi/mpich-test/pt2pt/typeub.c b/teshsuite/smpi/mpich-test/pt2pt/typeub.c index 4d17ffbd62..56b7660c33 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/typeub.c +++ b/teshsuite/smpi/mpich-test/pt2pt/typeub.c @@ -78,7 +78,7 @@ int main( int argc, char **argv ) MPI_Allreduce( &errs, &toterrs, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD ); MPI_Comm_rank( MPI_COMM_WORLD, &rank ); if (rank == 0) { - if (toterrs == 0) printf( "No errors\n" ); + if (toterrs == 0) printf( " No Errors\n" ); else printf( "Found %d errors\n", toterrs ); } diff --git a/teshsuite/smpi/mpich-test/pt2pt/waitall.std b/teshsuite/smpi/mpich-test/pt2pt/waitall.std index 73e2710272..f75da10caf 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/waitall.std +++ b/teshsuite/smpi/mpich-test/pt2pt/waitall.std @@ -1,3 +1 @@ -*** Testing MPI_Waitall *** Test complete -*** Testing MPI_Waitall *** diff --git a/teshsuite/smpi/mpich-test/pt2pt/waitany.std b/teshsuite/smpi/mpich-test/pt2pt/waitany.std index db3ac7200c..d8092c19ac 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/waitany.std +++ b/teshsuite/smpi/mpich-test/pt2pt/waitany.std @@ -1,4 +1,2 @@ -*** Testing MPI_Waitany *** done. eventId = 1 Test complete -*** Testing MPI_Waitany *** diff --git a/teshsuite/smpi/mpich-test/runbase b/teshsuite/smpi/mpich-test/runbase index 543d534b8e..ae91ba447d 100644 --- a/teshsuite/smpi/mpich-test/runbase +++ b/teshsuite/smpi/mpich-test/runbase @@ -191,7 +191,7 @@ RunTest() { else mname=$3 if [ -z "$mname" ] ; then mname="*** $1 ***" ; fi - echo "$mname" >> $pgm.out + #echo "$mname" >> $pgm.out echo "$mname" mvarg="" if [ -n "$5" ] ; then rm -f $5 ; @@ -209,13 +209,11 @@ RunTest() { fi done fi - echo "$mname" >> $pgm.out + #echo "$mname" >> $pgm.out if [ ! -s $srcdir/$pgm.std -a ! -s $pgm.stdo ] ; then # We don't need a special file if the output is just "No Errors" cat >>$pgm.stdo <