From 0edea454376bbdd0ef4201df524b22532f6acb46 Mon Sep 17 00:00:00 2001 From: vbd Date: Fri, 9 Nov 2007 14:58:20 +0000 Subject: [PATCH] *** empty log message *** --- src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx | 3 --- src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx | 6 ++---- src/ParaMEDMEM/Test/ParaMEDMEMTest_MPIProcessorGroup.cxx | 5 ++++- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx index c810f9a76..77664c7e5 100644 --- a/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx +++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx @@ -29,9 +29,6 @@ #include "mpi.h" -static int argc; -static char** argv; - class ParaMEDMEMTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE( ParaMEDMEMTest ); diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx index 0d2dcffa5..6c5ee73d0 100644 --- a/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx +++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx @@ -63,8 +63,8 @@ void ParaMEDMEMTest::testIntersectionDEC_2D() MPI_Comm_size(MPI_COMM_WORLD,&size); MPI_Comm_rank(MPI_COMM_WORLD,&rank); - //test is meant to run on five processors - if (size !=5) return 0; + //the test is meant to run on five processors + if (size !=5) return ; int nproc_source = 3; set self_procs; @@ -85,8 +85,6 @@ void ParaMEDMEMTest::testIntersectionDEC_2D() ParaMEDMEM::ParaMESH* source_mesh=0; ParaMEDMEM::ParaMESH* target_mesh=0; - - //loading the geometry for the source group diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_MPIProcessorGroup.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_MPIProcessorGroup.cxx index ef1ba7b25..62c6c9568 100644 --- a/src/ParaMEDMEM/Test/ParaMEDMEMTest_MPIProcessorGroup.cxx +++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_MPIProcessorGroup.cxx @@ -140,6 +140,9 @@ void ParaMEDMEMTest::testMPIProcessorGroup_rank() if (group2.containsMyRank()) { int trank=group_fuse->translateRank(&group2,0); - CPPUNIT_ASSERT_EQUAL(trank,1); + if (size==1) + CPPUNIT_ASSERT_EQUAL(trank,0); + else + CPPUNIT_ASSERT_EQUAL(trank,1); } } -- 2.39.2