From: abn Date: Tue, 1 Dec 2015 15:35:56 +0000 (+0100) Subject: Merge branch 'abn/mpi_imp' X-Git-Tag: V8_0_0a1~7 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=83e8c2e366e979fca040ac4ae86484847c01be15;p=modules%2Fmed.git Merge branch 'abn/mpi_imp' Conflicts: src/ParaMEDMEMTest/ParaMEDMEMTest.hxx - due to the move of MDLoader tests --- 83e8c2e366e979fca040ac4ae86484847c01be15 diff --cc src/ParaMEDMEMTest/ParaMEDMEMTest.hxx index b0295a08f,a8d777962..7deb11dca --- a/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx @@@ -66,16 -73,22 +73,16 @@@ class ParaMEDMEMTest : public CppUnit:: // CPPUNIT_TEST(testNonCoincidentDEC_2D); CPPUNIT_TEST(testNonCoincidentDEC_3D); #endif - CPPUNIT_TEST(testStructuredCoincidentDEC); - CPPUNIT_TEST(testStructuredCoincidentDEC); - CPPUNIT_TEST(testICoco1); - CPPUNIT_TEST(testGauthier1); - CPPUNIT_TEST(testGauthier2); - CPPUNIT_TEST(testGauthier3); - CPPUNIT_TEST(testGauthier4); - CPPUNIT_TEST(testFabienAPI1); - CPPUNIT_TEST(testFabienAPI2); + CPPUNIT_TEST(testStructuredCoincidentDEC); // 5 procs + CPPUNIT_TEST(testICoco1); // 2 procs + CPPUNIT_TEST(testGauthier1); // 4 procs + CPPUNIT_TEST(testGauthier2); // >= 2 procs + CPPUNIT_TEST(testGauthier3); // 4 procs + CPPUNIT_TEST(testGauthier4); // 3 procs + CPPUNIT_TEST(testFabienAPI1); // 3 procs + CPPUNIT_TEST(testFabienAPI2); // 3 procs + - // - CPPUNIT_TEST(testMEDLoaderRead1); - CPPUNIT_TEST(testMEDLoaderPolygonRead); - CPPUNIT_TEST(testMEDLoaderPolyhedronRead); - CPPUNIT_TEST_SUITE_END(); - public: