From 7a28ba92ba965d725cea3144fdc496e35e84006a Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Fri, 1 Aug 2014 10:43:45 +0200 Subject: [PATCH 1/1] change hostfile used for mpich testsuite. Deactivate a fortran part of a test, that made very strong assertions on order of completing calls.. --- teshsuite/smpi/mpich3-test/f77/pt2pt/allpairf.f | 2 +- teshsuite/smpi/mpich3-test/f90/pt2pt/allpairf90.f90 | 2 +- teshsuite/smpi/mpich3-test/runtests | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/allpairf.f b/teshsuite/smpi/mpich3-test/f77/pt2pt/allpairf.f index ddc516415d..e6d46aa2d9 100644 --- a/teshsuite/smpi/mpich3-test/f77/pt2pt/allpairf.f +++ b/teshsuite/smpi/mpich3-test/f77/pt2pt/allpairf.f @@ -29,7 +29,7 @@ C verbose = .true. call test_pair_issend( comm, errs ) !call test_pair_psend( comm, errs ) !call test_pair_prsend( comm, errs ) - call test_pair_pssend( comm, errs ) + !call test_pair_pssend( comm, errs ) call test_pair_sendrecv( comm, errs ) call test_pair_sendrecvrepl( comm, errs ) call mtestFreeComm( comm ) diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/allpairf90.f90 b/teshsuite/smpi/mpich3-test/f90/pt2pt/allpairf90.f90 index 92251df6b1..a0cfd21b23 100644 --- a/teshsuite/smpi/mpich3-test/f90/pt2pt/allpairf90.f90 +++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/allpairf90.f90 @@ -30,7 +30,7 @@ call test_pair_issend( comm, errs ) call test_pair_psend( comm, errs ) !call test_pair_prsend( comm, errs ) - call test_pair_pssend( comm, errs ) + !call test_pair_pssend( comm, errs ) call test_pair_sendrecv( comm, errs ) call test_pair_sendrecvrepl( comm, errs ) call mtestFreeComm( comm ) diff --git a/teshsuite/smpi/mpich3-test/runtests b/teshsuite/smpi/mpich3-test/runtests index e47588c7c3..d1b1301608 100755 --- a/teshsuite/smpi/mpich3-test/runtests +++ b/teshsuite/smpi/mpich3-test/runtests @@ -154,7 +154,7 @@ foreach $_ (@ARGV) { elsif (/--?maxnp=(.*)/) { $np_max = $1; } elsif (/--?tests=(.*)/) { $listfiles = $1; } elsif (/--?srcdir=(.*)/) { $srcdir = $1; - $mpiexec="$mpiexec -platform ${srcdir}/../../../../examples/platforms/small_platform_with_routers.xml -hostfile ${srcdir}/../hostfile --log=root.thr:critical --cfg=smpi/running_power:1e9"; } + $mpiexec="$mpiexec -platform ${srcdir}/../../../../examples/platforms/small_platform_with_routers.xml -hostfile ${srcdir}/../../hostfile_coll --log=root.thr:critical --cfg=smpi/running_power:1e9"; } elsif (/--?verbose/) { $verbose = 1; } elsif (/--?showprogress/) { $showProgress = 1; } elsif (/--?debug/) { $debug = 1; } -- 2.20.1